mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-11-09 16:18:34 +01:00
eea09eb9d3
Running the nixpkgs-merge-bot in GitHub Actions instead of a separate workflow has multiple advantages: - A much better development workflow, with improved testability. - The ability to label PRs with a "merge-bot eligible" label from the same codebase. - Using more data for merge strategy decisions, for example the number of rebuilds. This commits re-implements most of the features from the current nxipkgs-merge-bot directly in the bot workflow. Instead of reacting to webhook events, this now runs on the regular 10 minute schedule. Some merges might be delayed a few minutes, but that should not be a problem in practice. To give the user early feedback, there are additional workflows running when a comment or review is posted. These react with "eyes" to make the user aware that the comment has been recognized. The only feature not taken over was the size check for files in the PR. This kind of check is not really relevant for maintainer merges only - if we want to prevent bigger files from making it into the tree, then we need a generic CI check, which is out of scope for the merge-bot. Other than that, everything should be implemented - any omissions are by accident.
55 lines
1.8 KiB
YAML
55 lines
1.8 KiB
YAML
name: Comment
|
|
|
|
on:
|
|
issue_comment:
|
|
types: [created]
|
|
|
|
# This is used as fallback without app only.
|
|
# This happens when testing in forks without setting up that app.
|
|
permissions:
|
|
pull-requests: write
|
|
|
|
defaults:
|
|
run:
|
|
shell: bash
|
|
|
|
jobs:
|
|
# The `bot` workflow reacts to comments with @NixOS/nixpkgs-merge-bot references, but might only
|
|
# pick up a comment after up to 10 minutes. To give the user instant feedback, this job adds
|
|
# a reaction to these comments.
|
|
react:
|
|
name: React with eyes
|
|
runs-on: ubuntu-24.04-arm
|
|
timeout-minutes: 2
|
|
if: contains(github.event.comment.body, '@NixOS/nixpkgs-merge-bot merge')
|
|
steps:
|
|
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
|
|
with:
|
|
persist-credentials: false
|
|
sparse-checkout: |
|
|
ci/github-script
|
|
|
|
# Use the GitHub App to make sure the reaction happens with the same user who will later merge.
|
|
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
|
|
if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
|
|
id: app-token
|
|
with:
|
|
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
|
|
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
|
|
permission-pull-requests: write
|
|
|
|
- uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
|
|
with:
|
|
github-token: ${{ steps.app-token.outputs.token || github.token }}
|
|
retries: 3
|
|
script: |
|
|
const { handleMergeComment } = require('./ci/github-script/merge.js')
|
|
const { body, node_id } = context.payload.comment
|
|
|
|
await handleMergeComment({
|
|
github,
|
|
body,
|
|
node_id,
|
|
reaction: 'EYES',
|
|
})
|