···

       
24
       
 
       
    runs-on: ubuntu-24.04-arm

     

       
25
       
 
       
    needs: get-merge-commit

     

       
26
       
 
       
    if: needs.get-merge-commit.outputs.mergedSha

     

       
27
       
-
       
    outputs:

     

       
28
       
-
       
      targetSha: ${{ steps.targetSha.outputs.targetSha }}

     

       
29
       
 
       
    steps:

     

       
30
       
 
       
      - name: Check out the PR at the test merge commit

     

       
31
       
 
       
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

     

       
32
       
 
       
        with:

     

       
33
       
 
       
          ref: ${{ needs.get-merge-commit.outputs.mergedSha }}

     

       
34
       
-
       
          fetch-depth: 2

     

       
35
       
 
       
          path: nixpkgs

     

       
36
       
-
       


     

       
37
       
-
       
      - name: Determine target commit

     

       
38
       
-
       
        if: github.event_name == 'pull_request_target'

     

       
39
       
-
       
        id: targetSha

     

       
40
       
-
       
        run: |

     

       
41
       
-
       
          targetSha=$(git -C nixpkgs rev-parse HEAD^1)

     

       
42
       
-
       
          echo "targetSha=$targetSha" >> "$GITHUB_OUTPUT"

     

       
43
       
 
       


     

       
44
       
 
       
      - name: Install Nix

     

       
45
       
 
       
        uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31

     
···

       
143
       
 
       
          path: prResult/*

     

       
144
       
 
       


     

       
145
       
 
       
      - name: Get target run id

     

       
146
       
-
       
        if: needs.attrs.outputs.targetSha

     

       
147
       
 
       
        id: targetRunId

     

       
148
       
 
       
        run: |

     

       
149
       
 
       
          # Get the latest eval.yml workflow run for the PR's target commit

     
···

       
172
       
 
       
          echo "targetRunId=$runId" >> "$GITHUB_OUTPUT"

     

       
173
       
 
       
        env:

     

       
174
       
 
       
          REPOSITORY: ${{ github.repository }}

     

       
175
       
-
       
          TARGET_SHA: ${{ needs.attrs.outputs.targetSha }}

     

       
176
       
 
       
          GH_TOKEN: ${{ github.token }}

     

       
177
       
 
       


     

       
178
       
 
       
      - uses: actions/download-artifact@v4

     
···

       
186
       
 
       
      - name: Compare against the target branch

     

       
187
       
 
       
        if: steps.targetRunId.outputs.targetRunId

     

       
188
       
 
       
        run: |

     

       
189
       
-
       
          git -C nixpkgs worktree add ../target ${{ needs.attrs.outputs.targetSha }}

     

       
190
       
-
       
          git -C nixpkgs diff --name-only ${{ needs.attrs.outputs.targetSha }} \

     

       
191
       
 
       
            | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json

     

       
192
       
 
       


     

       
193
       
 
       
          # Use the target branch to get accurate maintainer info

     
···

       
241
       
 
       
      - name: Check out Nixpkgs at the base commit

     

       
242
       
 
       
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

     

       
243
       
 
       
        with:

     

       
244
       
-
       
          ref: ${{ needs.attrs.outputs.targetSha }}

     

       
245
       
 
       
          path: base

     

       
246
       
 
       
          sparse-checkout: ci

     

       
247
       
 
       


     

···

       
24
       
 
       
    runs-on: ubuntu-24.04-arm

     

       
25
       
 
       
    needs: get-merge-commit

     

       
26
       
 
       
    if: needs.get-merge-commit.outputs.mergedSha

     

       
0
       
 
       

     

       
0
       
 
       

     

       
27
       
 
       
    steps:

     

       
28
       
 
       
      - name: Check out the PR at the test merge commit

     

       
29
       
 
       
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

     

       
30
       
 
       
        with:

     

       
31
       
 
       
          ref: ${{ needs.get-merge-commit.outputs.mergedSha }}

     

       
0
       
 
       

     

       
32
       
 
       
          path: nixpkgs

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
33
       
 
       


     

       
34
       
 
       
      - name: Install Nix

     

       
35
       
 
       
        uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31

     
···

       
133
       
 
       
          path: prResult/*

     

       
134
       
 
       


     

       
135
       
 
       
      - name: Get target run id

     

       
136
       
+
       
        if: needs.get-merge-commit.outputs.targetSha

     

       
137
       
 
       
        id: targetRunId

     

       
138
       
 
       
        run: |

     

       
139
       
 
       
          # Get the latest eval.yml workflow run for the PR's target commit

     
···

       
162
       
 
       
          echo "targetRunId=$runId" >> "$GITHUB_OUTPUT"

     

       
163
       
 
       
        env:

     

       
164
       
 
       
          REPOSITORY: ${{ github.repository }}

     

       
165
       
+
       
          TARGET_SHA: ${{ needs.get-merge-commit.outputs.targetSha }}

     

       
166
       
 
       
          GH_TOKEN: ${{ github.token }}

     

       
167
       
 
       


     

       
168
       
 
       
      - uses: actions/download-artifact@v4

     
···

       
176
       
 
       
      - name: Compare against the target branch

     

       
177
       
 
       
        if: steps.targetRunId.outputs.targetRunId

     

       
178
       
 
       
        run: |

     

       
179
       
+
       
          git -C nixpkgs worktree add ../target ${{ needs.get-merge-commit.outputs.targetSha }}

     

       
180
       
+
       
          git -C nixpkgs diff --name-only ${{ needs.get-merge-commit.outputs.targetSha }} \

     

       
181
       
 
       
            | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json

     

       
182
       
 
       


     

       
183
       
 
       
          # Use the target branch to get accurate maintainer info

     
···

       
231
       
 
       
      - name: Check out Nixpkgs at the base commit

     

       
232
       
 
       
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

     

       
233
       
 
       
        with:

     

       
234
       
+
       
          ref: ${{ needs.get-merge-commit.outputs.targetSha }}

     

       
235
       
 
       
          path: base

     

       
236
       
 
       
          sparse-checkout: ci

     

       
237
       
 
       


     

···

       
6
       
 
       
      mergedSha:

     

       
7
       
 
       
        description: "The merge commit SHA"

     

       
8
       
 
       
        value: ${{ jobs.resolve-merge-commit.outputs.mergedSha }}

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
9
       
 
       
      systems:

     

       
10
       
 
       
        description: "The supported systems"

     

       
11
       
 
       
        value: ${{ jobs.resolve-merge-commit.outputs.systems }}

     
···

       
17
       
 
       
    runs-on: ubuntu-24.04-arm

     

       
18
       
 
       
    outputs:

     

       
19
       
 
       
      mergedSha: ${{ steps.merged.outputs.mergedSha }}

     

       
0
       
 
       

     

       
20
       
 
       
      systems: ${{ steps.systems.outputs.systems }}

     

       
21
       
 
       
    steps:

     

       
22
       
 
       
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

     
···

       
35
       
 
       
              echo "mergedSha=${{ github.sha }}" >> "$GITHUB_OUTPUT"

     

       
36
       
 
       
              ;;

     

       
37
       
 
       
            pull_request_target)

     

       
38
       
-
       
              if mergedSha=$(base/ci/get-merge-commit.sh ${{ github.repository }} ${{ github.event.number }}); then

     

       
39
       
-
       
                echo "Checking the merge commit $mergedSha"

     

       
40
       
-
       
                echo "mergedSha=$mergedSha" >> "$GITHUB_OUTPUT"

     

       
41
       
 
       
              else

     

       
42
       
 
       
                # Skipping so that no notifications are sent

     

       
43
       
 
       
                echo "Skipping the rest..."

     

···

       
6
       
 
       
      mergedSha:

     

       
7
       
 
       
        description: "The merge commit SHA"

     

       
8
       
 
       
        value: ${{ jobs.resolve-merge-commit.outputs.mergedSha }}

     

       
9
       
+
       
      targetSha:

     

       
10
       
+
       
        description: "The target commit SHA"

     

       
11
       
+
       
        value: ${{ jobs.resolve-merge-commit.outputs.targetSha }}

     

       
12
       
 
       
      systems:

     

       
13
       
 
       
        description: "The supported systems"

     

       
14
       
 
       
        value: ${{ jobs.resolve-merge-commit.outputs.systems }}

     
···

       
20
       
 
       
    runs-on: ubuntu-24.04-arm

     

       
21
       
 
       
    outputs:

     

       
22
       
 
       
      mergedSha: ${{ steps.merged.outputs.mergedSha }}

     

       
23
       
+
       
      targetSha: ${{ steps.merged.outputs.targetSha }}

     

       
24
       
 
       
      systems: ${{ steps.systems.outputs.systems }}

     

       
25
       
 
       
    steps:

     

       
26
       
 
       
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

     
···

       
39
       
 
       
              echo "mergedSha=${{ github.sha }}" >> "$GITHUB_OUTPUT"

     

       
40
       
 
       
              ;;

     

       
41
       
 
       
            pull_request_target)

     

       
42
       
+
       
              if commits=$(base/ci/get-merge-commit.sh ${{ github.repository }} ${{ github.event.number }}); then

     

       
43
       
+
       
                echo "Checking the commits:\n$commits"

     

       
44
       
+
       
                echo "$commits" >> "$GITHUB_OUTPUT"

     

       
45
       
 
       
              else

     

       
46
       
 
       
                # Skipping so that no notifications are sent

     

       
47
       
 
       
                echo "Skipping the rest..."

     

···

       
44
       
 
       
## `get-merge-commit.sh GITHUB_REPO PR_NUMBER`

     

       
45
       
 
       


     

       
46
       
 
       
Check whether a PR is mergeable and return the test merge commit as

     

       
47
       
-
       
[computed by GitHub](https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests).

     

       
48
       
 
       


     

       
49
       
 
       
Arguments:

     

       
50
       
 
       
- `GITHUB_REPO`: The repository of the PR, e.g. `NixOS/nixpkgs`

     

       
51
       
 
       
- `PR_NUMBER`: The PR number, e.g. `1234`

     

       
52
       
 
       


     

       
53
       
 
       
Exit codes:

     

       
54
       
-
       
- 0: The PR can be merged, the test merge commit hash is returned on stdout

     

       
55
       
 
       
- 1: The PR cannot be merged because it's not open anymore

     

       
56
       
 
       
- 2: The PR cannot be merged because it has a merge conflict

     

       
57
       
 
       
- 3: The merge commit isn't being computed, GitHub is likely having internal issues, unknown if the PR is mergeable

     

···

       
44
       
 
       
## `get-merge-commit.sh GITHUB_REPO PR_NUMBER`

     

       
45
       
 
       


     

       
46
       
 
       
Check whether a PR is mergeable and return the test merge commit as

     

       
47
       
+
       
[computed by GitHub](https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests) and its parent.

     

       
48
       
 
       


     

       
49
       
 
       
Arguments:

     

       
50
       
 
       
- `GITHUB_REPO`: The repository of the PR, e.g. `NixOS/nixpkgs`

     

       
51
       
 
       
- `PR_NUMBER`: The PR number, e.g. `1234`

     

       
52
       
 
       


     

       
53
       
 
       
Exit codes:

     

       
54
       
+
       
- 0: The PR can be merged, the hashes of the test merge commit and the target commit are returned on stdout

     

       
55
       
 
       
- 1: The PR cannot be merged because it's not open anymore

     

       
56
       
 
       
- 2: The PR cannot be merged because it has a merge conflict

     

       
57
       
 
       
- 3: The merge commit isn't being computed, GitHub is likely having internal issues, unknown if the PR is mergeable

     

···

       
55
       
 
       


     

       
56
       
 
       
if [[ "$mergeable" == "true" ]]; then

     

       
57
       
 
       
    log "The PR can be merged"

     

       
58
       
-
       
    jq -r .merge_commit_sha <<< "$prInfo"

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
59
       
 
       
else

     

       
60
       
 
       
    log "The PR has a merge conflict"

     

       
61
       
 
       
    exit 2

     

···

       
55
       
 
       


     

       
56
       
 
       
if [[ "$mergeable" == "true" ]]; then

     

       
57
       
 
       
    log "The PR can be merged"

     

       
58
       
+
       
    mergedSha="$(jq -r .merge_commit_sha <<< "$prInfo")"

     

       
59
       
+
       
    echo "mergedSha=$mergedSha"

     

       
60
       
+
       
    targetSha="$(gh api "/repos/$repo/commits/$mergedSha" --jq '.parents[0].sha')"

     

       
61
       
+
       
    echo "targetSha=$targetSha"

     

       
62
       
 
       
else

     

       
63
       
 
       
    log "The PR has a merge conflict"

     

       
64
       
 
       
    exit 2