commit 82434f382c30a7e0f72c5053ea1bcc9c85407238 · pyrox.dev/nixpkgs

+120 -16

.github/workflows/eval.yml

···

       1
       1
        
       name: Eval

     

       2
       2
        
       

     

       3
       3
       -
       on: pull_request_target

     

       3
       3
       +
       on:

     

       4
       4
       +
         pull_request_target:

     

       5
       5
       +
         push:

     

       6
       6
       +
           # Keep this synced with ci/request-reviews/dev-branches.txt

     

       7
       7
       +
           branches:

     

       8
       8
       +
             - master

     

       9
       9
       +
             - staging

     

       10
       10
       +
             - release-*

     

       11
       11
       +
             - staging-*

     

       12
       12
       +
             - haskell-updates

     

       13
       13
       +
             - python-updates

     

       4
       14
        
       

     

       5
       15
        
       permissions:

     

       6
       16
        
         contents: read

     
···

       11
       21
        
           runs-on: ubuntu-latest

     

       12
       22
        
           outputs:

     

       13
       23
        
             mergedSha: ${{ steps.merged.outputs.mergedSha }}

     

       24
       24
       +
             baseSha: ${{ steps.baseSha.outputs.baseSha }}

     

       14
       25
        
             systems: ${{ steps.systems.outputs.systems }}

     

       15
       26
        
           steps:

     

       16
       27
        
             # Important: Because of `pull_request_target`, this doesn't check out the PR,

     
···

       24
       35
        
               id: merged

     

       25
       36
        
               env:

     

       26
       37
        
                 GH_TOKEN: ${{ github.token }}

     

       38
       38
       +
                 GH_EVENT: ${{ github.event_name }}

     

       27
       39
        
               run: |

     

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

     

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

     

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

     

       31
       31
       -
                 else

     

       32
       32
       -
                   # Skipping so that no notifications are sent

     

       33
       33
       -
                   echo "Skipping the rest..."

     

       34
       34
       -
                 fi

     

       40
       40
       +
                 case "$GH_EVENT" in

     

       41
       41
       +
                   push)

     

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

     

       43
       43
       +
                     ;;

     

       44
       44
       +
                   pull_request_target)

     

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

     

       46
       46
       +
                       echo "Checking the merge commit $mergedSha"

     

       47
       47
       +
                       echo "mergedSha=$mergedSha" >> "$GITHUB_OUTPUT"

     

       48
       48
       +
                     else

     

       49
       49
       +
                       # Skipping so that no notifications are sent

     

       50
       50
       +
                       echo "Skipping the rest..."

     

       51
       51
       +
                     fi

     

       52
       52
       +
                     ;;

     

       53
       53
       +
                 esac

     

       35
       54
        
                 rm -rf base

     

       36
       55
        
             - name: Check out the PR at the test merge commit

     

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

     
···

       39
       58
        
               if: steps.merged.outputs.mergedSha

     

       40
       59
        
               with:

     

       41
       60
        
                 ref: ${{ steps.merged.outputs.mergedSha }}

     

       61
       61
       +
                 fetch-depth: 2

     

       42
       62
        
                 path: nixpkgs

     

       63
       63
       +
       

     

       64
       64
       +
             - name: Determine base commit

     

       65
       65
       +
               if: github.event_name == 'pull_request_target' && steps.merged.outputs.mergedSha

     

       66
       66
       +
               id: baseSha

     

       67
       67
       +
               run: |

     

       68
       68
       +
                 baseSha=$(git -C nixpkgs rev-parse HEAD^1)

     

       69
       69
       +
                 echo "baseSha=$baseSha" >> "$GITHUB_OUTPUT"

     

       43
       70
        
       

     

       44
       71
        
             - name: Install Nix

     

       45
       72
        
               uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30

     
···

       105
       132
        
           name: Process

     

       106
       133
        
           runs-on: ubuntu-latest

     

       107
       134
        
           needs: [ outpaths, attrs ]

     

       135
       135
       +
           outputs:

     

       136
       136
       +
             baseRunId: ${{ steps.baseRunId.outputs.baseRunId }}

     

       108
       137
        
           steps:

     

       109
       138
        
             - name: Download output paths and eval stats for all systems

     

       110
       139
        
               uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8

     
···

       124
       153
        
             - name: Combine all output paths and eval stats

     

       125
       154
        
               run: |

     

       126
       155
        
                 nix-build nixpkgs/ci -A eval.combine \

     

       127
       127
       -
                   --arg resultsDir ./intermediate

     

       156
       156
       +
                   --arg resultsDir ./intermediate \

     

       157
       157
       +
                   -o prResult

     

       128
       158
        
       

     

       129
       159
        
             - name: Upload the combined results

     

       130
       160
        
               uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3

     

       131
       161
        
               with:

     

       132
       162
        
                 name: result

     

       133
       133
       -
                 path: result/*

     

       163
       163
       +
                 path: prResult/*

     

       134
       164
        
       

     

       165
       165
       +
             - name: Get base run id

     

       166
       166
       +
               if: needs.attrs.outputs.baseSha

     

       167
       167
       +
               id: baseRunId

     

       168
       168
       +
               run: |

     

       169
       169
       +
                 # Get the latest eval.yml workflow run for the PR's base commit

     

       170
       170
       +
                 if ! run=$(gh api --method GET /repos/"$REPOSITORY"/actions/workflows/eval.yml/runs \

     

       171
       171
       +
                   -f head_sha="$BASE_SHA" \

     

       172
       172
       +
                   --jq '.workflow_runs | sort_by(.run_started_at) | .[-1]') \

     

       173
       173
       +
                   || [[ -z "$run" ]]; then

     

       174
       174
       +
                   echo "Could not find an eval.yml workflow run for $BASE_SHA, cannot make comparison"

     

       175
       175
       +
                   exit 0

     

       176
       176
       +
                 fi

     

       177
       177
       +
                 echo "Comparing against $(jq .html_url <<< "$run")"

     

       178
       178
       +
                 runId=$(jq .id <<< "$run")

     

       179
       179
       +
                 conclusion=$(jq -r .conclusion <<< "$run")

     

       135
       180
        
       

     

       136
       136
       -
             # TODO: Run this workflow also on `push` (on at least the main development branches)

     

       137
       137
       -
             # Then add an extra step here that waits for the base branch (not the merge base, because that could be very different)

     

       138
       138
       -
             # to have completed the eval, then use

     

       139
       139
       -
             # gh api --method GET /repos/NixOS/nixpkgs/actions/workflows/eval.yml/runs -f head_sha=<BASE>

     

       140
       140
       -
             # and follow it to the artifact results, where you can then download the outpaths.json from the base branch

     

       141
       141
       -
             # That can then be used to compare the number of changed paths, get evaluation stats and ping appropriate reviewers

     

       181
       181
       +
                 while [[ "$conclusion" == null ]]; do

     

       182
       182
       +
                   echo "Workflow not done, waiting 10 seconds before checking again"

     

       183
       183
       +
                   sleep 10

     

       184
       184
       +
                   conclusion=$(gh api /repos/"$REPOSITORY"/actions/runs/"$runId" --jq '.conclusion')

     

       185
       185
       +
                 done

     

       186
       186
       +
       

     

       187
       187
       +
                 if [[ "$conclusion" != "success" ]]; then

     

       188
       188
       +
                   echo "Workflow was not successful, cannot make comparison"

     

       189
       189
       +
                   exit 0

     

       190
       190
       +
                 fi

     

       191
       191
       +
       

     

       192
       192
       +
                 echo "baseRunId=$runId" >> "$GITHUB_OUTPUT"

     

       193
       193
       +
               env:

     

       194
       194
       +
                 REPOSITORY: ${{ github.repository }}

     

       195
       195
       +
                 BASE_SHA: ${{ needs.attrs.outputs.baseSha }}

     

       196
       196
       +
                 GH_TOKEN: ${{ github.token }}

     

       197
       197
       +
       

     

       198
       198
       +
             - uses: actions/download-artifact@v4

     

       199
       199
       +
               if: steps.baseRunId.outputs.baseRunId

     

       200
       200
       +
               with:

     

       201
       201
       +
                 name: result

     

       202
       202
       +
                 path: baseResult

     

       203
       203
       +
                 github-token: ${{ github.token }}

     

       204
       204
       +
                 run-id: ${{ steps.baseRunId.outputs.baseRunId }}

     

       205
       205
       +
       

     

       206
       206
       +
             - name: Compare against the base branch

     

       207
       207
       +
               if: steps.baseRunId.outputs.baseRunId

     

       208
       208
       +
               run: |

     

       209
       209
       +
                 nix-build nixpkgs/ci -A eval.compare \

     

       210
       210
       +
                   --arg beforeResultDir ./baseResult \

     

       211
       211
       +
                   --arg afterResultDir ./prResult \

     

       212
       212
       +
                   -o comparison

     

       213
       213
       +
       

     

       214
       214
       +
                 # TODO: Request reviews from maintainers for packages whose files are modified in the PR

     

       215
       215
       +
       

     

       216
       216
       +
             - name: Upload the combined results

     

       217
       217
       +
               if: steps.baseRunId.outputs.baseRunId

     

       218
       218
       +
               uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3

     

       219
       219
       +
               with:

     

       220
       220
       +
                 name: comparison

     

       221
       221
       +
                 path: comparison/*

     

       222
       222
       +
       

     

       223
       223
       +
         # Separate job to have a very tightly scoped PR write token

     

       224
       224
       +
         tag:

     

       225
       225
       +
           name: Tag

     

       226
       226
       +
           runs-on: ubuntu-latest

     

       227
       227
       +
           needs: process

     

       228
       228
       +
           if: needs.process.outputs.baseRunId

     

       229
       229
       +
           permissions:

     

       230
       230
       +
             pull-requests: write

     

       231
       231
       +
           steps:

     

       232
       232
       +
             - name: Download process result

     

       233
       233
       +
               uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8

     

       234
       234
       +
               with:

     

       235
       235
       +
                 name: comparison

     

       236
       236
       +
                 path: comparison

     

       237
       237
       +
       

     

       238
       238
       +
             - name: Tagging pull request

     

       239
       239
       +
               run: |

     

       240
       240
       +
                 gh api \

     

       241
       241
       +
                   --method POST \

     

       242
       242
       +
                   /repos/${{ github.repository }}/issues/${{ github.event.number }}/labels \

     

       243
       243
       +
                   --input <(jq -c '{ labels: .labels }' comparison/changed-paths.json)

     

       244
       244
       +
               env:

     

       245
       245
       +
                 GH_TOKEN: ${{ github.token }}

+152

ci/eval/compare.jq

···

       1
       1
       +
       # Turns

     

       2
       2
       +
       #

     

       3
       3
       +
       #   {

     

       4
       4
       +
       #     "hello.aarch64-linux": "a",

     

       5
       5
       +
       #     "hello.x86_64-linux": "b",

     

       6
       6
       +
       #     "hello.aarch64-darwin": "c",

     

       7
       7
       +
       #     "hello.x86_64-darwin": "d"

     

       8
       8
       +
       #   }

     

       9
       9
       +
       #

     

       10
       10
       +
       # into

     

       11
       11
       +
       #

     

       12
       12
       +
       #   {

     

       13
       13
       +
       #     "hello": {

     

       14
       14
       +
       #       "linux": {

     

       15
       15
       +
       #         "aarch64": "a",

     

       16
       16
       +
       #         "x86_64": "b"

     

       17
       17
       +
       #       },

     

       18
       18
       +
       #       "darwin": {

     

       19
       19
       +
       #         "aarch64": "c",

     

       20
       20
       +
       #         "x86_64": "d"

     

       21
       21
       +
       #       }

     

       22
       22
       +
       #     }

     

       23
       23
       +
       #   }

     

       24
       24
       +
       #

     

       25
       25
       +
       # while filtering out any attribute paths that don't match this pattern

     

       26
       26
       +
       def expand_system:

     

       27
       27
       +
         to_entries

     

       28
       28
       +
         | map(

     

       29
       29
       +
           .key |= split(".")

     

       30
       30
       +
           | select(.key | length > 1)

     

       31
       31
       +
           | .double = (.key[-1] | split("-"))

     

       32
       32
       +
           | select(.double | length == 2)

     

       33
       33
       +
         )

     

       34
       34
       +
         | group_by(.key[0:-1])

     

       35
       35
       +
         | map(

     

       36
       36
       +
           {

     

       37
       37
       +
             key: .[0].key[0:-1] | join("."),

     

       38
       38
       +
             value:

     

       39
       39
       +
               group_by(.double[1])

     

       40
       40
       +
               | map(

     

       41
       41
       +
                 {

     

       42
       42
       +
                   key: .[0].double[1],

     

       43
       43
       +
                   value: map(.key = .double[0]) | from_entries

     

       44
       44
       +
                 }

     

       45
       45
       +
               )

     

       46
       46
       +
               | from_entries

     

       47
       47
       +
           })

     

       48
       48
       +
         | from_entries

     

       49
       49
       +
         ;

     

       50
       50
       +
       

     

       51
       51
       +
       # Transposes

     

       52
       52
       +
       #

     

       53
       53
       +
       #   {

     

       54
       54
       +
       #     "a": [ "x", "y" ],

     

       55
       55
       +
       #     "b": [ "x" ],

     

       56
       56
       +
       #   }

     

       57
       57
       +
       #

     

       58
       58
       +
       # into

     

       59
       59
       +
       #

     

       60
       60
       +
       #   {

     

       61
       61
       +
       #     "x": [ "a", "b" ],

     

       62
       62
       +
       #     "y": [ "a" ]

     

       63
       63
       +
       #   }

     

       64
       64
       +
       def transpose:

     

       65
       65
       +
         [

     

       66
       66
       +
           to_entries[]

     

       67
       67
       +
           | {

     

       68
       68
       +
             key: .key,

     

       69
       69
       +
             value: .value[]

     

       70
       70
       +
           }

     

       71
       71
       +
         ]

     

       72
       72
       +
         | group_by(.value)

     

       73
       73
       +
         | map({

     

       74
       74
       +
           key: .[0].value,

     

       75
       75
       +
           value: map(.key)

     

       76
       76
       +
         })

     

       77
       77
       +
         | from_entries

     

       78
       78
       +
         ;

     

       79
       79
       +
       

     

       80
       80
       +
       # Computes the key difference for two objects:

     

       81
       81
       +
       # {

     

       82
       82
       +
       #   added: [ <keys only in the second object> ],

     

       83
       83
       +
       #   removed: [ <keys only in the first object> ],

     

       84
       84
       +
       #   changed: [ <keys with different values between the two objects> ],

     

       85
       85
       +
       # }

     

       86
       86
       +
       #

     

       87
       87
       +
       def diff($before; $after):

     

       88
       88
       +
         {

     

       89
       89
       +
           added: $after | delpaths($before | keys | map([.])) | keys,

     

       90
       90
       +
           removed: $before | delpaths($after | keys | map([.])) | keys,

     

       91
       91
       +
           changed:

     

       92
       92
       +
             $before

     

       93
       93
       +
             | to_entries

     

       94
       94
       +
             | map(

     

       95
       95
       +
               $after."\(.key)" as $after2

     

       96
       96
       +
               | select(

     

       97
       97
       +
                 # Filter out attributes that don't exist anymore

     

       98
       98
       +
                 ($after2 != null)

     

       99
       99
       +
                 and

     

       100
       100
       +
                 # Filter out attributes that are the same as the new value

     

       101
       101
       +
                 (.value != $after2)

     

       102
       102
       +
               )

     

       103
       103
       +
               | .key

     

       104
       104
       +
             )

     

       105
       105
       +
         }

     

       106
       106
       +
         ;

     

       107
       107
       +
       

     

       108
       108
       +
       ($before[0] | expand_system) as $before

     

       109
       109
       +
       | ($after[0] | expand_system) as $after

     

       110
       110
       +
       | .attrdiff = diff($before; $after)

     

       111
       111
       +
       | .rebuildsByKernel = (

     

       112
       112
       +
         .attrdiff.changed

     

       113
       113
       +
         | map({

     

       114
       114
       +
           key: .,

     

       115
       115
       +
           value: diff($before."\(.)"; $after."\(.)").changed

     

       116
       116
       +
         })

     

       117
       117
       +
         | from_entries

     

       118
       118
       +
         | transpose

     

       119
       119
       +
       )

     

       120
       120
       +
       | .rebuildCountByKernel = (

     

       121
       121
       +
         .rebuildsByKernel

     

       122
       122
       +
         | with_entries(.value |= length)

     

       123
       123
       +
         | pick(.linux, .darwin)

     

       124
       124
       +
         | {

     

       125
       125
       +
           linux: (.linux // 0),

     

       126
       126
       +
           darwin: (.darwin // 0),

     

       127
       127
       +
         }

     

       128
       128
       +
       )

     

       129
       129
       +
       | .labels = (

     

       130
       130
       +
         .rebuildCountByKernel

     

       131
       131
       +
         | to_entries

     

       132
       132
       +
         | map(

     

       133
       133
       +
           "10.rebuild-\(.key): " +

     

       134
       134
       +
             if .value == 0 then

     

       135
       135
       +
               "0"

     

       136
       136
       +
             elif .value <= 10 then

     

       137
       137
       +
               "1-10"

     

       138
       138
       +
             elif .value <= 100 then

     

       139
       139
       +
               "11-100"

     

       140
       140
       +
             elif .value <= 500 then

     

       141
       141
       +
               "101-500"

     

       142
       142
       +
             elif .value <= 1000 then

     

       143
       143
       +
               "501-1000"

     

       144
       144
       +
             elif .value <= 2500 then

     

       145
       145
       +
               "1001-2500"

     

       146
       146
       +
             elif .value <= 5000 then

     

       147
       147
       +
               "2501-5000"

     

       148
       148
       +
             else

     

       149
       149
       +
               "5000+"

     

       150
       150
       +
             end

     

       151
       151
       +
         )

     

       152
       152
       +
       )

+19

ci/eval/default.nix

···

       246
       246
        
                 jq -s from_entries > $out/stats.json

     

       247
       247
        
             '';

     

       248
       248
        
       

     

       249
       249
       +
         compare =

     

       250
       250
       +
           { beforeResultDir, afterResultDir }:

     

       251
       251
       +
           runCommand "compare"

     

       252
       252
       +
             {

     

       253
       253
       +
               nativeBuildInputs = [

     

       254
       254
       +
                 jq

     

       255
       255
       +
               ];

     

       256
       256
       +
             }

     

       257
       257
       +
             ''

     

       258
       258
       +
               mkdir $out

     

       259
       259
       +
               jq -n -f ${./compare.jq} \

     

       260
       260
       +
                 --slurpfile before ${beforeResultDir}/outpaths.json \

     

       261
       261
       +
                 --slurpfile after ${afterResultDir}/outpaths.json \

     

       262
       262
       +
                 > $out/changed-paths.json

     

       263
       263
       +
       

     

       264
       264
       +
               # TODO: Compare eval stats

     

       265
       265
       +
             '';

     

       266
       266
       +
       

     

       249
       267
        
         full =

     

       250
       268
        
           {

     

       251
       269
        
             # Whether to evaluate just a single system, by default all are evaluated

     
···

       276
       294
        
           attrpathsSuperset

     

       277
       295
        
           singleSystem

     

       278
       296
        
           combine

     

       297
       297
       +
           compare

     

       279
       298
        
           # The above three are used by separate VMs in a GitHub workflow,

     

       280
       299
        
           # while the below is intended for testing on a single local machine

     

       281
       300
        
           full

ci/request-reviews/dev-branches.txt

···

       1
       1
        
       # Trusted development branches:

     

       2
       2
        
       # These generally require PRs to update and are built by Hydra.

     

       3
       3
       +
       # Keep this synced with the branches in .github/workflows/eval.yml

     

       3
       4
        
       master

     

       4
       5
        
       staging

     

       5
       6
        
       release-*