From f8008e4b3beb4aae2365973879a46fe0f15c79b4 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Wed, 13 Sep 2023 19:06:49 +0300 Subject: [PATCH] Nix CI: use DetSys' install & cache actions --- .github/workflows/nix-build.yml | 11 ++--------- .github/workflows/nix-update-inputs.yml | 10 +--------- .github/workflows/nix-update-wlroots.yml | 10 +--------- 3 files changed, 4 insertions(+), 27 deletions(-) diff --git a/.github/workflows/nix-build.yml b/.github/workflows/nix-build.yml index 7f630ecf4af..fb98f099337 100644 --- a/.github/workflows/nix-build.yml +++ b/.github/workflows/nix-build.yml @@ -20,15 +20,8 @@ jobs: with: ref: ${{ github.ref }} - - name: Install Nix - uses: cachix/install-nix-action@v22 - with: - install_url: https://nixos.org/nix/install - extra_nix_config: | - auto-optimise-store = true - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - experimental-features = nix-command flakes - + - uses: DeterminateSystems/nix-installer-action@main + - uses: DeterminateSystems/magic-nix-cache-action@main - uses: cachix/cachix-action@v12 with: name: hyprland diff --git a/.github/workflows/nix-update-inputs.yml b/.github/workflows/nix-update-inputs.yml index 2de1cf9f7b5..f5df3f4fc08 100644 --- a/.github/workflows/nix-update-inputs.yml +++ b/.github/workflows/nix-update-inputs.yml @@ -14,15 +14,7 @@ jobs: with: token: ${{ secrets.PAT }} - - name: Install nix - uses: cachix/install-nix-action@v22 - with: - install_url: https://nixos.org/nix/install - extra_nix_config: | - auto-optimise-store = true - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - experimental-features = nix-command flakes - + - uses: DeterminateSystems/nix-installer-action@main - name: Update inputs run: nix/update-inputs.sh diff --git a/.github/workflows/nix-update-wlroots.yml b/.github/workflows/nix-update-wlroots.yml index 82bbc311ce6..a0db9ef5bb7 100644 --- a/.github/workflows/nix-update-wlroots.yml +++ b/.github/workflows/nix-update-wlroots.yml @@ -16,15 +16,7 @@ jobs: with: token: ${{ secrets.PAT }} - - name: Install nix - uses: cachix/install-nix-action@v22 - with: - install_url: https://nixos.org/nix/install - extra_nix_config: | - auto-optimise-store = true - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - experimental-features = nix-command flakes - + - uses: DeterminateSystems/nix-installer-action@main - name: Update lockfile run: nix/update-wlroots.sh