diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index a832127..94f4cc1 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -17,11 +17,13 @@ jobs: fetch-depth: 0 - uses: cachix/install-nix-action@v16 - - uses: cachix/cachix-action@v8 + - uses: cachix/cachix-action@v10 if: ${{ github.event_name == 'push' }} with: name: dcompass authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + # Don't push source or .iso files as they are pointless to take up precious cache space. + pushFilter: '(-source$|nixpkgs\.tar\.gz$)' # Run the general flake checks - run: nix flake check -vL diff --git a/commit.nix b/commit.nix index 306b6d8..fceb269 100644 --- a/commit.nix +++ b/commit.nix @@ -28,6 +28,7 @@ pkgs.mkShell { find . -path ./target -prune -false -o -type f -name '*.sh' -exec shellcheck {} + find . -path ./target -prune -false -o -type f -name '*.sh' -exec shfmt -w {} + find . -path ./target -prune -false -o -type f -name '*.nix' -exec nixfmt {} + + nix flake update cargo update cargo fmt -- --check cargo build diff --git a/flake.lock b/flake.lock index 4641958..b417de7 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1663357389, - "narHash": "sha256-oYA2nVRSi6yhCBqS5Vz465Hw+3BQOVFEhfbfy//3vTs=", + "lastModified": 1664106353, + "narHash": "sha256-HMJP80+DSxFySpWyuxz5+iNozS3+dVt0b4n6YMIU5/8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "da6a05816e7fa5226c3f61e285ef8d9dfc868f3c", + "rev": "79d3ca08920364759c63fd3eb562e99c0c17044a", "type": "github" }, "original": { @@ -60,11 +60,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1663470205, - "narHash": "sha256-04OnrzLLWWE73GBpIgNR2NfjPH3MiHpwN1ueMQObsAc=", + "lastModified": 1664247556, + "narHash": "sha256-J4vazHU3609ekn7dr+3wfqPo5WGlZVAgV7jfux352L0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2ac8be332f507e521c235caa37cb0b2fc698cbd9", + "rev": "524db9c9ea7bc7743bb74cdd45b6d46ea3fcc2ab", "type": "github" }, "original": {