From 83ac77b864644d423a40a40fd7d2a70dfc5e414f Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 26 May 2025 17:36:16 +1000 Subject: [PATCH] workflows/cachix: cd out and in, to hopefully fix git-crypt problem --- .github/workflows/cachix.yml | 14 +++----------- flake.nix | 2 -- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml index b0bc057..aa9e67d 100644 --- a/.github/workflows/cachix.yml +++ b/.github/workflows/cachix.yml @@ -21,17 +21,9 @@ jobs: with: name: lava authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - name: Wait.. - run: - for s in {1..10}; do - nix eval .#checks.x86_64-linux.is_dirty; - if [ $? -eq 0 ]; then - break; - elif [ $s -eq 10 ]; then - exit 1; - fi; - sleep 5; - done + - run: + cd / + cd - - run: nix flake check --keep-going --verbose build: diff --git a/flake.nix b/flake.nix index 98ffdac..98a4505 100644 --- a/flake.nix +++ b/flake.nix @@ -78,8 +78,6 @@ nixosConfigurations."hazel" = mkSystem nixpkgs-stable "hazel" "x86_64-linux" []; nixosConfigurations."hyacinth" = mkSystem nixpkgs "hyacinth" "x86_64-linux" []; - checks."x86_64-linux".is_dirty = if !(self ? rev) then throw "Dirty git tree detected." else self.rev; - packages."x86_64-linux" = let pkgs = import nixpkgs rec {