From 618b1b481bddcb6ab8bbb2121f5585294664f53a Mon Sep 17 00:00:00 2001 From: jakobkukla Date: Tue, 19 Mar 2024 13:16:48 +0100 Subject: [PATCH] ci: replace nix-build-uncached with nix-fast-build FIXME: this doesn't work yet since the cachix action doesn't support flakes yet. See https://github.com/cachix/cachix-action/issues/47 --- .github/workflows/cachix.yml | 4 +--- .github/workflows/update.yml | 4 +--- ci.nix | 6 ------ 3 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 ci.nix diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml index ce518e0..f4952bc 100644 --- a/.github/workflows/cachix.yml +++ b/.github/workflows/cachix.yml @@ -22,10 +22,8 @@ jobs: with: github_access_token: ${{ secrets.GITHUB_TOKEN }} - uses: DeterminateSystems/magic-nix-cache-action@main - - name: Install nix-build-uncached - run: nix-env -f '' -iA nix-build-uncached - uses: cachix/cachix-action@v14 with: name: jakobkukla authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - run: nix-build-uncached ./ci.nix + - run: nix run github:Mic92/nix-fast-build -- --skip-cached --no-nom --flake ".#nixosConfigurations.matebook.config.system.build.toplevel" diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 42a4ae7..a8a9b62 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -18,8 +18,6 @@ jobs: with: github_access_token: ${{ secrets.GITHUB_TOKEN }} - uses: DeterminateSystems/magic-nix-cache-action@main - - name: Install nix-build-uncached - run: nix-env -f '' -iA nix-build-uncached - uses: cachix/cachix-action@v14 with: name: jakobkukla @@ -28,7 +26,7 @@ jobs: id: build run: | nix flake update - nix-build-uncached ./ci.nix + nix run github:Mic92/nix-fast-build -- --skip-cached --no-nom --flake ".#nixosConfigurations.matebook.config.system.build.toplevel" - name: Commit flake.lock on success if: steps.build.outcome == 'success' uses: stefanzweifel/git-auto-commit-action@v5 diff --git a/ci.nix b/ci.nix deleted file mode 100644 index 86d4793..0000000 --- a/ci.nix +++ /dev/null @@ -1,6 +0,0 @@ -let - outputs = builtins.getFlake (toString ./.); - pkgs = outputs.inputs.nixpkgs; - drvs = pkgs.lib.collect pkgs.lib.isDerivation outputs.nixosConfigurations.matebook.config.system.build.toplevel; -in - drvs