From d7d82d615937c95fbbdc5e2accce5cd23d904c03 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Wed, 22 May 2024 17:57:25 -0300 Subject: [PATCH 1/3] Fix input name for CI-only strict mode --- .github/workflows/check-and-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-and-test.yaml b/.github/workflows/check-and-test.yaml index bace43e..dbc8ff4 100644 --- a/.github/workflows/check-and-test.yaml +++ b/.github/workflows/check-and-test.yaml @@ -83,7 +83,7 @@ jobs: uses: DeterminateSystems/magic-nix-cache-action@test-fail-mode with: source-binary: "${{ steps.extract.outputs.mnc-path }}" - strict-mode: true + _internal-strict-mode: true - name: Run nix to test magic-nix-cache-action run: | From ec4b6cdab4de4f82203607fceecefe813f39b67f Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Wed, 22 May 2024 17:59:29 -0300 Subject: [PATCH 2/3] Switch to main branch of magic-nix-cache-action --- .github/workflows/check-and-test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-and-test.yaml b/.github/workflows/check-and-test.yaml index dbc8ff4..3e1e21e 100644 --- a/.github/workflows/check-and-test.yaml +++ b/.github/workflows/check-and-test.yaml @@ -79,8 +79,8 @@ jobs: echo "mnc-path=${MAGIC_NIX_CACHE}" >> "$GITHUB_OUTPUT" - - name: Test magic-nix-cache-action@test-fail-mode on ${{ matrix.systems.runner }} - uses: DeterminateSystems/magic-nix-cache-action@test-fail-mode + - name: Test magic-nix-cache-action@main on ${{ matrix.systems.runner }} + uses: DeterminateSystems/magic-nix-cache-action@main with: source-binary: "${{ steps.extract.outputs.mnc-path }}" _internal-strict-mode: true From 684efd3b98a536616189f65f77765dfac7a84713 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Wed, 22 May 2024 18:25:15 -0300 Subject: [PATCH 3/3] Remove closure extraction step --- .github/workflows/check-and-test.yaml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/check-and-test.yaml b/.github/workflows/check-and-test.yaml index 3e1e21e..93d17f4 100644 --- a/.github/workflows/check-and-test.yaml +++ b/.github/workflows/check-and-test.yaml @@ -69,20 +69,10 @@ jobs: - name: Install Nix on ${{ matrix.systems.system }} uses: DeterminateSystems/nix-installer-action@main - - name: Extract closure for ${{ matrix.systems.system }} - id: extract - run: | - ARTIFACT="${{ env.ARTIFACT_KEY }}/${{ env.ARCHIVE_NAME }}" - OUTPUT=$(cat ${ARTIFACT} | xz -d | nix-store --import) - MNC_BIN_PATH=$(echo "${OUTPUT}" | tail -n 1) - MAGIC_NIX_CACHE="${MNC_BIN_PATH}/bin/magic-nix-cache" - - echo "mnc-path=${MAGIC_NIX_CACHE}" >> "$GITHUB_OUTPUT" - - name: Test magic-nix-cache-action@main on ${{ matrix.systems.runner }} uses: DeterminateSystems/magic-nix-cache-action@main with: - source-binary: "${{ steps.extract.outputs.mnc-path }}" + source-binary: "${{ env.ARTIFACT_KEY }}/${{ env.ARCHIVE_NAME }}" _internal-strict-mode: true - name: Run nix to test magic-nix-cache-action