diff --git a/.github/actions/checkout/action.yml b/.github/actions/checkout/action.yml index e3c592f6e53a..751eef7600cd 100644 --- a/.github/actions/checkout/action.yml +++ b/.github/actions/checkout/action.yml @@ -6,7 +6,7 @@ inputs: merged-as-untrusted-at: description: "Whether and which SHA to checkout for the merge commit in the ./untrusted folder." type: boolean - pinnedFrom: + pinned-from: description: "Whether to checkout the pinned nixpkgs for CI and from where (trusted, untrusted)." type: string target-as-trusted-at: @@ -31,21 +31,21 @@ runs: ref: ${{ inputs.target-as-trusted-at }} path: trusted - - if: inputs.pinnedFrom + - if: inputs.pinned-from id: pinned uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 env: - PINNED_FROM: ${{ inputs.pinnedFrom }} + PINNED_FROM: ${{ inputs.pinned-from }} with: script: | const path = require('node:path') const pinned = require(path.resolve(path.join(process.env.PINNED_FROM, 'ci', 'pinned.json'))) - core.setOutput('pinnedSha', pinned.pins.nixpkgs.revision) + core.setOutput('pinned-at', pinned.pins.nixpkgs.revision) - - if: steps.pinned.outputs.pinnedSha + - if: steps.pinned.outputs.pinned-at uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: - ref: ${{ steps.pinned.outputs.pinnedSha }} + ref: ${{ steps.pinned.outputs.pinned-at }} path: pinned sparse-checkout: | lib diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d8fe8272d625..9cfc329107ad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,7 +51,7 @@ jobs: uses: ./.github/actions/checkout with: merged-as-untrusted-at: ${{ inputs.mergedSha }} - pinnedFrom: untrusted + pinned-from: untrusted - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31 with: diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index aca22eddff6b..dcbc5af199b8 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -103,7 +103,7 @@ jobs: uses: ./.github/actions/checkout with: merged-as-untrusted-at: ${{ inputs.mergedSha }} - pinnedFrom: trusted + pinned-from: trusted target-as-trusted-at: ${{ inputs.targetSha }} - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31 diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index a92e64de6715..c19549a4eb47 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -91,7 +91,7 @@ jobs: uses: ./.github/actions/checkout with: merged-as-untrusted-at: ${{ inputs.mergedSha }} - pinnedFrom: untrusted + pinned-from: untrusted - name: Install Nix uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31 @@ -208,7 +208,7 @@ jobs: uses: ./.github/actions/checkout with: target-as-trusted-at: ${{ inputs.targetSha }} - pinnedFrom: trusted + pinned-from: trusted - name: Download output paths and eval stats for all systems uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 817f42d496ad..97387126eb57 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -28,7 +28,7 @@ jobs: uses: ./.github/actions/checkout with: merged-as-untrusted-at: ${{ inputs.mergedSha }} - pinnedFrom: untrusted + pinned-from: untrusted - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31 @@ -59,7 +59,7 @@ jobs: uses: ./.github/actions/checkout with: merged-as-untrusted-at: ${{ inputs.mergedSha }} - pinnedFrom: untrusted + pinned-from: untrusted - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31 @@ -79,7 +79,7 @@ jobs: uses: ./.github/actions/checkout with: merged-as-untrusted-at: ${{ inputs.mergedSha }} - pinnedFrom: untrusted + pinned-from: untrusted target-as-trusted-at: ${{ inputs.targetSha }} - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31