From d00d0c8be825e2c638b0cec59b173c0d42f5d10f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 4 Nov 2020 21:05:19 +0100 Subject: [PATCH] update install-nix-action --- .github/workflows/test.yml | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 79d5f5e..e37567d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,45 +5,51 @@ on: jobs: tests: runs-on: macos-10.15 - timeout-minutes: 10 + timeout-minutes: 30 steps: - uses: actions/checkout@v2 - - uses: cachix/install-nix-action@v9 - - run: nix-build ./release.nix -I darwin=. -A tests - - run: nix-build ./release.nix -I darwin=. -A manpages - - run: nix-build ./release.nix -I darwin=. -A examples.simple + - uses: cachix/install-nix-action@v12 + - run: nix-build ./release.nix -I nixpkgs=channel:nixpkgs-20.09-darwin -I darwin=. -A tests + - run: nix-build ./release.nix -I nixpkgs=channel:nixpkgs-20.09-darwin -I darwin=. -A manpages + - run: nix-build ./release.nix -I nixpkgs=channel:nixpkgs-20.09-darwin -I darwin=. -A examples.simple install: runs-on: macos-10.15 - timeout-minutes: 10 + timeout-minutes: 30 steps: - uses: actions/checkout@v2 - - uses: cachix/install-nix-action@v8 + - uses: cachix/install-nix-action@v12 - run: | + nix-channel --add https://nixos.org/channels/nixpkgs-20.09-darwin nixpkgs nix-channel --update echo "FIXME workaround channel permission error" - run: | + export NIX_PATH=$HOME/.nix-defexpr/channels nix-shell -A installer nix-shell -A installer.check - run: | . /etc/static/bashrc darwin-rebuild switch -I darwin=. - run: | + export NIX_PATH=$HOME/.nix-defexpr/channels nix-shell -A uninstaller nix-shell -A uninstaller.check install-flake: runs-on: macos-10.15 - timeout-minutes: 10 + timeout-minutes: 30 steps: - uses: actions/checkout@v2 - - uses: cachix/install-nix-action@v8 + - uses: cachix/install-nix-action@v12 - run: | + nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgs nix-channel --update echo "FIXME workaround channel permission error" - nix-shell -A installer + - run: | + NIX_PATH=$HOME/.nix-defexpr/channels nix-shell -A installer echo "TODO installed doesn't support flakes, handle multi-user install" - run: | - nix-shell -p nixFlakes --run 'nix --experimental-features "nix-command flakes" registry add darwin $PWD' - nix-shell -p nixFlakes --run 'nix --experimental-features "nix-command flakes" build ./modules/examples#darwinConfigurations.simple.system' + nix-build channel:nixpkgs-unstable -A nixUnstable -o nix-unstable + ./nix-unstable/bin/nix --experimental-features 'nix-command flakes' registry add darwin $PWD + ./nix-unstable/bin/nix --experimental-features 'nix-command flakes' build ./modules/examples#darwinConfigurations.simple.system - run: | ./result/sw/bin/darwin-rebuild switch --flake ./modules/examples#simple - run: |