commit 962836d4d0bdad936e973194a8935363f34a2678 · pyrox.dev/nixpkgs

+5 -15

.github/workflows/eval.yml

···

       24
       24
        
           runs-on: ubuntu-24.04-arm

     

       25
       25
        
           needs: get-merge-commit

     

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

     

       27
       27
       -
           outputs:

     

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

     

       29
       27
        
           steps:

     

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

     

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

     

       32
       30
        
               with:

     

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

     

       34
       34
       -
                 fetch-depth: 2

     

       35
       32
        
                 path: nixpkgs

     

       36
       36
       -
       

     

       37
       37
       -
             - name: Determine target commit

     

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

     

       39
       39
       -
               id: targetSha

     

       40
       40
       -
               run: |

     

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

     

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

     

       43
       33
        
       

     

       44
       34
        
             - name: Install Nix

     

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

     
···

       143
       133
        
                 path: prResult/*

     

       144
       134
        
       

     

       145
       135
        
             - name: Get target run id

     

       146
       146
       -
               if: needs.attrs.outputs.targetSha

     

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

     

       147
       137
        
               id: targetRunId

     

       148
       138
        
               run: |

     

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

     
···

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

     

       173
       163
        
               env:

     

       174
       164
        
                 REPOSITORY: ${{ github.repository }}

     

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

     

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

     

       176
       166
        
                 GH_TOKEN: ${{ github.token }}

     

       177
       167
        
       

     

       178
       168
        
             - uses: actions/download-artifact@v4

     
···

       186
       176
        
             - name: Compare against the target branch

     

       187
       177
        
               if: steps.targetRunId.outputs.targetRunId

     

       188
       178
        
               run: |

     

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

     

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

     

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

     

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

     

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

     

       192
       182
        
       

     

       193
       183
        
                 # Use the target branch to get accurate maintainer info

     
···

       241
       231
        
             - name: Check out Nixpkgs at the base commit

     

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

     

       243
       233
        
               with:

     

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

     

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

     

       245
       235
        
                 path: base

     

       246
       236
        
                 sparse-checkout: ci

     

       247
       237

+7 -3

.github/workflows/get-merge-commit.yml

···

       6
       6
        
             mergedSha:

     

       7
       7
        
               description: "The merge commit SHA"

     

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

     

       9
       9
       +
             targetSha:

     

       10
       10
       +
               description: "The target commit SHA"

     

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

     

       9
       12
        
             systems:

     

       10
       13
        
               description: "The supported systems"

     

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

     
···

       17
       20
        
           runs-on: ubuntu-24.04-arm

     

       18
       21
        
           outputs:

     

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

     

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

     

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

     

       21
       25
        
           steps:

     

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

     
···

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

     

       36
       40
        
                     ;;

     

       37
       41
        
                   pull_request_target)

     

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

     

       39
       39
       -
                       echo "Checking the merge commit $mergedSha"

     

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

     

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

     

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

     

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

     

       41
       45
        
                     else

     

       42
       46
        
                       # Skipping so that no notifications are sent

     

       43
       47
        
                       echo "Skipping the rest..."

+2 -2

ci/README.md

···

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

     

       45
       45
        
       

     

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

     

       47
       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).

     

       47
       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
       48
        
       

     

       49
       49
        
       Arguments:

     

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

     

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

     

       52
       52
        
       

     

       53
       53
        
       Exit codes:

     

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

     

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

     

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

     

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

     

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

+4 -1

ci/get-merge-commit.sh

···

       55
       55
        
       

     

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

     

       57
       57
        
           log "The PR can be merged"

     

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

     

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

     

       59
       59
       +
           echo "mergedSha=$mergedSha"

     

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

     

       61
       61
       +
           echo "targetSha=$targetSha"

     

       59
       62
        
       else

     

       60
       63
        
           log "The PR has a merge conflict"

     

       61
       64
        
           exit 2