Skip to content

Commit

Permalink
Add nix_path action paramter
Browse files Browse the repository at this point in the history
  • Loading branch information
Gerschtli committed May 28, 2020
1 parent 14f0e86 commit 9124e42
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 5 deletions.
20 changes: 19 additions & 1 deletion .github/workflows/test.yml
Expand Up @@ -2,6 +2,7 @@ name: "install-nix-action test"
on:
pull_request:
push:

jobs:
simple-build:
strategy:
Expand All @@ -19,6 +20,7 @@ jobs:
# cachix should be available and be able to configure a cache
- run: cachix use cachix
- run: nix-build test.nix

no-channel:
strategy:
matrix:
Expand All @@ -33,4 +35,20 @@ jobs:
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
- run: NIX_PATH=nixpkgs=https://github.com/NixOS/nixpkgs/tarball/ab5863afada3c1b50fc43bf774b75ea71b287cde nix-build test.nix

custom-nix-path:
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:
nix_path: nixpkgs=channel:nixos-20.03
- run: test $NIX_PATH == "nixpkgs=channel:nixos-20.03"
- run: nix-build test.nix
2 changes: 2 additions & 0 deletions README.md
Expand Up @@ -19,6 +19,8 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: cachix/install-nix-action@v9
with:
nix_path: nixpkgs=channel:nixos-unstable
- run: nix-build
```

Expand Down
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'
nix_path:
description: 'Set NIX_PATH environment variable. If set "skip_adding_nixpkgs_channel" will be implicitly enabled'
skip_adding_nixpkgs_channel:
description: 'Skip adding nixpkgs-unstable channel'
branding:
Expand Down
10 changes: 6 additions & 4 deletions lib/install-nix.sh
Expand Up @@ -6,10 +6,11 @@ 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'

if [[ $INPUT_SKIP_ADDING_NIXPKGS_CHANNEL = "true" ]]; then
if [[ $INPUT_SKIP_ADDING_NIXPKGS_CHANNEL = "true" || $INPUT_NIX_PATH != "" ]]; then
extra_cmd=--no-channel-add
else
extra_cmd=
INPUT_NIX_PATH="/nix/var/nix/profiles/per-user/root/channels"
fi

sh <(curl -L ${INPUT_INSTALL_URL:-https://nixos.org/nix/install}) \
Expand All @@ -29,6 +30,7 @@ fi
# Set paths
echo "::add-path::/nix/var/nix/profiles/per-user/runner/profile/bin"
echo "::add-path::/nix/var/nix/profiles/default/bin"
if [[ $INPUT_SKIP_ADDING_NIXPKGS_CHANNEL != "true" ]]; then
echo "::set-env name=NIX_PATH::/nix/var/nix/profiles/per-user/root/channels"
fi

if [[ $INPUT_NIX_PATH != "" ]]; then
echo "::set-env name=NIX_PATH::${INPUT_NIX_PATH}"
fi

0 comments on commit 9124e42

Please sign in to comment.