Skip to content

Commit

Permalink
allow skipping channel installation
Browse files Browse the repository at this point in the history
  • Loading branch information
domenkozar committed May 27, 2020
1 parent 642cfa0 commit 10a7d51
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 7 deletions.
21 changes: 17 additions & 4 deletions .github/workflows/test.yml
Expand Up @@ -3,7 +3,7 @@ on:
pull_request:
push:
jobs:
tests:
simple-build:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
Expand All @@ -14,10 +14,23 @@ jobs:
- run: yarn build
- name: Install Nix
uses: ./
with:
install_url: https://static.domenkozar.com/install-2.3.5-pre
- run: nix-env -iA cachix -f https://github.com/NixOS/nixpkgs/tarball/ab5863afada3c1b50fc43bf774b75ea71b287cde
- run: nix-env -iA cachix -f https://cachix.org/api/v1/install
- run: cat /etc/nix/nix.conf
# cachix should be available and be able to configure a cache
- run: cachix use cachix
- run: nix-build test.nix
no-channel:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- run: yarn install --frozen-lockfile
- run: yarn build
- name: Install Nix
uses: ./
with:
skip_adding_nixpkgs_channel: true
- run: nix-build test.nix && exit 1 || echo "OK"
- run: NIX_PATH=nixpkgs=https://github.com/NixOS/nixpkgs/tarball/ab5863afada3c1b50fc43bf774b75ea71b287cde nix-build test.nix
2 changes: 2 additions & 0 deletions action.yml
Expand Up @@ -4,6 +4,8 @@ author: 'Domen Kožar'
inputs:
install_url:
description: 'Installation URL that will contain a script to install Nix'
skip_adding_nixpkgs_channel:
description: 'Skip adding nixpkgs-unstable channel'
branding:
color: 'blue'
icon: 'sun'
Expand Down
14 changes: 11 additions & 3 deletions lib/install-nix.sh
Expand Up @@ -6,8 +6,14 @@ sudo sh -c 'echo max-jobs = auto >> /tmp/nix.conf'
# Allow binary caches for runner user
sudo sh -c 'echo trusted-users = root runner >> /tmp/nix.conf'

sh <(curl -L ${INPUT_INSTALL_URL:-https://nixos.org/nix/install}) \
--daemon --daemon-user-count 4 --nix-extra-conf-file /tmp/nix.conf --darwin-use-unencrypted-nix-store-volume
if [[ $INPUT_SKIP_ADDING_NIXPKGS_CHANNEL = "true" ]]; then
extra_cmd=--no-channel-add
else
extra_cmd=
fi

sh <(curl -L ${INPUT_INSTALL_URL:-https://static.domenkozar.com/install-2.3.5-pre}) \
--daemon --daemon-user-count 4 --nix-extra-conf-file /tmp/nix.conf --darwin-use-unencrypted-nix-store-volume $extra_cmd

if [[ $OSTYPE =~ darwin ]]; then
# Disable spotlight indexing of /nix to speed up performance
Expand All @@ -23,4 +29,6 @@ fi
# Set paths
echo "::add-path::/nix/var/nix/profiles/per-user/runner/profile/bin"
echo "::add-path::/nix/var/nix/profiles/default/bin"
echo "::set-env name=NIX_PATH::/nix/var/nix/profiles/per-user/root/channels"
if [[ $INPUT_SKIP_ADDING_NIXPKGS_CHANNEL != "true" ]]; then
echo "::set-env name=NIX_PATH::/nix/var/nix/profiles/per-user/root/channels"
fi

0 comments on commit 10a7d51

Please sign in to comment.