From dfa4d6665416a731134f5d3b8511e0b59501d72a Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 31 Mar 2024 19:57:27 -0400 Subject: [PATCH] ci: update actions --- .github/workflows/autobot.yaml | 2 +- .github/workflows/docker.yml | 8 ++++---- .github/workflows/nix.yml | 21 +++++++++++++-------- .github/workflows/update-flake.yml | 8 ++++---- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.github/workflows/autobot.yaml b/.github/workflows/autobot.yaml index 3a5606e..195eabe 100644 --- a/.github/workflows/autobot.yaml +++ b/.github/workflows/autobot.yaml @@ -14,7 +14,7 @@ jobs: if: github.actor == 'dependabot[bot]' steps: - - uses: dependabot/fetch-metadata@v1 + - uses: dependabot/fetch-metadata@v2 id: metadata with: github-token: ${{ github.token }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 44776b0..d7afa64 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -19,17 +19,17 @@ jobs: - uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v9 + uses: DeterminateSystems/nix-installer-action@v10 - name: Setup Nix cache - uses: DeterminateSystems/magic-nix-cache-action@v2 + uses: DeterminateSystems/magic-nix-cache-action@v4 - name: Build Docker image id: build run: | - nix build -L --accept-flake-config .#container-${{ matrix.arch }} + nix build --print-build-logs .#container-${{ matrix.arch }} [ ! -L result ] && exit 1 - echo "path=$(realpath result)" >> "$GITHUB_OUTPUT" + echo "path=$(readlink -f result)" >> "$GITHUB_OUTPUT" - name: Upload image uses: actions/upload-artifact@v4 diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index e44af28..f7fb3e6 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -20,27 +20,32 @@ jobs: uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v9 + uses: DeterminateSystems/nix-installer-action@v10 - name: Setup Nix cache - uses: DeterminateSystems/magic-nix-cache-action@v2 + uses: DeterminateSystems/magic-nix-cache-action@v4 - name: Build refraction - run: nix build -L --fallback + run: nix build --fallback --print-build-logs check: - name: Check - runs-on: ubuntu-latest + name: Check flake + + strategy: + matrix: + os: [ubuntu-latest, macos-latest] + + runs-on: ${{ matrix.os }} steps: - name: Checkout repository uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v9 + uses: DeterminateSystems/nix-installer-action@v10 - name: Setup Nix cache - uses: DeterminateSystems/magic-nix-cache-action@v2 + uses: DeterminateSystems/magic-nix-cache-action@v4 - name: Run checks - run: nix flake check -L --show-trace + run: nix flake check --print-build-logs --show-trace diff --git a/.github/workflows/update-flake.yml b/.github/workflows/update-flake.yml index fabcaf0..e66c5de 100644 --- a/.github/workflows/update-flake.yml +++ b/.github/workflows/update-flake.yml @@ -18,11 +18,11 @@ jobs: - uses: actions/checkout@v4 - name: Install Nix - uses: nixbuild/nix-quick-install-action@v26 + uses: nixbuild/nix-quick-install-action@v27 - name: Update and create PR - uses: DeterminateSystems/update-flake-lock@v20 + uses: DeterminateSystems/update-flake-lock@v21 with: - commit-msg: 'nix: update inputs' - pr-title: 'nix: update inputs' + commit-msg: 'nix: update flake.lock' + pr-title: 'nix: update flake.lock' token: ${{ github.token }}