diff --git a/.github/workflows/automate-update.yml b/.github/workflows/automate-update.yml index 710c2fc4..c7b92cea 100644 --- a/.github/workflows/automate-update.yml +++ b/.github/workflows/automate-update.yml @@ -18,11 +18,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 - with: - nix_path: nixpkgs=channel:nixos-unstable - extra_nix_config: | - keep-going = true + - uses: DeterminateSystems/magic-nix-cache-action@v2 + - uses: DeterminateSystems/nix-installer-action@v4 - name: Update flake inputs run: | nix flake update --commit-lock-file \ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94b59196..d921317e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,13 +9,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 - with: - nix_path: nixpkgs=channel:nixos-unstable - extra_nix_config: | - keep-going = true - - run: | - sudo apt clean + - uses: DeterminateSystems/magic-nix-cache-action@v2 + - uses: DeterminateSystems/nix-installer-action@v4 - name: Prepare push to binary cache uses: cachix/cachix-action@v12 if: ${{ github.ref == 'refs/heads/master' }} diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index c6d794b7..51964ec1 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -9,11 +9,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 - with: - nix_path: nixpkgs=channel:nixos-unstable - extra_nix_config: | - keep-going = true + - uses: DeterminateSystems/magic-nix-cache-action@v2 + - uses: DeterminateSystems/nix-installer-action@v4 - name: Check flake outputs run: nix flake check --impure diff --git a/.github/workflows/iso.yml b/.github/workflows/iso.yml index 4acfcb24..81988deb 100644 --- a/.github/workflows/iso.yml +++ b/.github/workflows/iso.yml @@ -9,9 +9,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v20 - with: - nix_path: nixpkgs=channel:nixos-unstable + - uses: DeterminateSystems/magic-nix-cache-action@v2 + - uses: DeterminateSystems/nix-installer-action@v4 - name: Build ISO id: build-iso # TODO: Use the registry. diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml index dfa12038..8d439a95 100644 --- a/.github/workflows/site.yml +++ b/.github/workflows/site.yml @@ -10,9 +10,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 - with: - nix_path: nixpkgs=channel:nixos-unstable + - uses: DeterminateSystems/magic-nix-cache-action@v2 + - uses: DeterminateSystems/nix-installer-action@v4 - env: NIXPKGS_ALLOW_UNFREE: "1" run: nix develop .#docs --impure -c hugo -s ./docs/ diff --git a/.github/workflows/update-firefox-addons.yml b/.github/workflows/update-firefox-addons.yml index d05a9695..4fe9729c 100644 --- a/.github/workflows/update-firefox-addons.yml +++ b/.github/workflows/update-firefox-addons.yml @@ -9,7 +9,7 @@ on: paths: - 'pkgs/firefox-addons' jobs: - build: + update-firefox-addons: runs-on: ubuntu-latest permissions: content: write @@ -18,9 +18,8 @@ jobs: id: metadata run: echo "DATE=$(date +%F)" >> "$GITHUB_OUTPUT" - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 - with: - nix_path: nixpkgs=channel:nixos-unstable + - uses: DeterminateSystems/magic-nix-cache-action@v2 + - uses: DeterminateSystems/nix-installer-action@v4 - env: NIXPKGS_ALLOW_UNFREE: "1" run: nix develop --impure -c mozilla-addons-to-nix pkgs/firefox-addons/firefox-addons.json pkgs/firefox-addons/default.nix