commit b6bbf7b2509cf967934baa3bbe5502cdd7fa7151 · pyrox.dev/nixpkgs

+6 -5

.github/workflows/check.yml

···

       42
       42
        
                 EOF

     

       43
       43
        
                 exit 1

     

       44
       44
        
       

     

       45
       45
       -
         cherry-pick:

     

       46
       46
       -
           if: |

     

       47
       47
       -
             github.event_name == 'pull_request' ||

     

       48
       48
       -
             (fromJSON(inputs.baseBranch).stable && !contains(fromJSON(inputs.headBranch).type, 'development'))

     

       45
       45
       +
         commits:

     

       49
       46
        
           permissions:

     

       50
       47
        
             pull-requests: write

     

       51
       48
        
           runs-on: ubuntu-24.04-arm

     
···

       65
       62
        
                 GH_TOKEN: ${{ github.token }}

     

       66
       63
        
               run: gh api /rate_limit | jq

     

       67
       64
        
       

     

       68
       68
       -
             - name: Check cherry-picks

     

       65
       65
       +
             - name: Check commits

     

       69
       66
        
               id: check

     

       70
       67
        
               uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1

     

       68
       68
       +
               env:

     

       69
       69
       +
                 TARGETS_STABLE: ${{ fromJSON(inputs.baseBranch).stable && !contains(fromJSON(inputs.headBranch).type, 'development') }}

     

       71
       70
        
               with:

     

       72
       71
        
                 script: |

     

       72
       72
       +
                   const targetsStable = JSON.parse(process.env.TARGETS_STABLE)

     

       73
       73
        
                   require('./trusted/ci/github-script/commits.js')({

     

       74
       74
        
                     github,

     

       75
       75
        
                     context,

     

       76
       76
        
                     core,

     

       77
       77
        
                     dry: context.eventName == 'pull_request',

     

       78
       78
       +
                     cherryPicks: context.eventName == 'pull_request' || targetsStable,

     

       78
       79
        
                   })

     

       79
       80
        
       

     

       80
       81
        
             - name: Log current API rate limits

+13 -7

ci/github-script/commits.js

···

       1
       1
       -
       module.exports = async ({ github, context, core, dry }) => {

     

       1
       1
       +
       module.exports = async ({ github, context, core, dry, cherryPicks }) => {

     

       2
       2
        
         const { execFileSync } = require('node:child_process')

     

       3
       3
        
         const { classify } = require('../supportedBranches.js')

     

       4
       4
        
         const withRateLimit = require('./withRateLimit.js')

     
···

       16
       16
        
                 run_id: context.runId,

     

       17
       17
        
                 per_page: 100,

     

       18
       18
        
               })

     

       19
       19
       -
             ).find(({ name }) => name.endsWith('Check / cherry-pick')).html_url +

     

       19
       19
       +
             ).find(({ name }) => name.endsWith('Check / commits')).html_url +

     

       20
       20
        
               '?pr=' +

     

       21
       21
        
               pull_number

     

       22
       22
        
       

     
···

       137
       137
        
             }

     

       138
       138
        
           }

     

       139
       139
        
       

     

       140
       140
       -
           const commits = await github.paginate(github.rest.pulls.listCommits, {

     

       141
       141
       -
             ...context.repo,

     

       142
       142
       -
             pull_number,

     

       143
       143
       -
           })

     

       140
       140
       +
           // For now we short-circuit the list of commits when cherryPicks should not be checked.

     

       141
       141
       +
           // This will not run any checks, but still trigger the "dismiss reviews" part below.

     

       142
       142
       +
           const commits = !cherryPicks

     

       143
       143
       +
             ? []

     

       144
       144
       +
             : await github.paginate(github.rest.pulls.listCommits, {

     

       145
       145
       +
                 ...context.repo,

     

       146
       146
       +
                 pull_number,

     

       147
       147
       +
               })

     

       144
       148
        
       

     

       145
       149
        
           const extracted = await Promise.all(commits.map(extract))

     

       146
       150
        
       

     
···

       185
       189
        
       

     

       186
       190
        
           // Only create step summary below in case of warnings or errors.

     

       187
       191
        
           // Also clean up older reviews, when all checks are good now.

     

       192
       192
       +
           // An empty results array will always trigger this condition, which is helpful

     

       193
       193
       +
           // to clean up reviews created by the prepare step when on the wrong branch.

     

       188
       194
        
           if (results.every(({ severity }) => severity === 'info')) {

     

       189
       195
        
             if (!dry) {

     

       190
       196
        
               await Promise.all(

     
···

       201
       207
        
                         ...context.repo,

     

       202
       208
        
                         pull_number,

     

       203
       209
        
                         review_id: review.id,

     

       204
       204
       -
                         message: 'All cherry-picks are good now, thank you!',

     

       210
       210
       +
                         message: 'All good now, thank you!',

     

       205
       211
        
                       })

     

       206
       212
        
                     }

     

       207
       213
        
                     await github.graphql(

+7 -5

ci/github-script/run

···

       7
       7
        
       import * as core from '@actions/core'

     

       8
       8
        
       import { getOctokit } from '@actions/github'

     

       9
       9
        
       

     

       10
       10
       -
       async function run(action, owner, repo, pull_number, dry = true) {

     

       10
       10
       +
       async function run(action, owner, repo, pull_number, options = {}) {

     

       11
       11
        
         const token = execSync('gh auth token', { encoding: 'utf-8' }).trim()

     

       12
       12
        
       

     

       13
       13
        
         const github = getOctokit(token)

     
···

       35
       35
        
             },

     

       36
       36
        
           },

     

       37
       37
        
           core,

     

       38
       38
       -
           dry,

     

       38
       38
       +
           dry: true,

     

       39
       39
       +
           ...options,

     

       39
       40
        
         })

     

       40
       41
        
       }

     

       41
       42
        
       

     
···

       56
       57
        
         .argument('<owner>', 'Owner of the GitHub repository to check (Example: NixOS)')

     

       57
       58
        
         .argument('<repo>', 'Name of the GitHub repository to check (Example: nixpkgs)')

     

       58
       59
        
         .argument('<pr>', 'Number of the Pull Request to check')

     

       59
       59
       -
         .action(async (owner, repo, pr) => {

     

       60
       60
       +
         .option('--no-cherry-picks', 'Do not expect cherry-picks.')

     

       61
       61
       +
         .action(async (owner, repo, pr, options) => {

     

       60
       62
        
           const commits = (await import('./commits.js')).default

     

       61
       61
       -
           run(commits, owner, repo, pr)

     

       63
       63
       +
           run(commits, owner, repo, pr, options)

     

       62
       64
        
         })

     

       63
       65
        
       

     

       64
       66
        
       program

     
···

       74
       76
        
           try {

     

       75
       77
        
             process.env.GITHUB_WORKSPACE = tmp

     

       76
       78
        
             process.chdir(tmp)

     

       77
       77
       -
             run(labels, owner, repo, pr, options.dry)

     

       79
       79
       +
             run(labels, owner, repo, pr, options)

     

       78
       80
        
           } finally {

     

       79
       81
        
             rmSync(tmp, { recursive: true })

     

       80
       82
        
           }