build: fix auto merge with merge queues #1213
Conversation
| workflow_call: { } | ||
|
|
||
| concurrency: |
There was a problem hiding this comment.
💭 Added this as a nice to have copied from the Zeebe CI. I can remove it of course, but it's generally useful to avoid having multiple runs for the same commit.
.github/workflows/build-test.yml
Outdated
| @@ -178,13 +192,15 @@ jobs: | |||
| - id: approve-and-merge-dependabot | |||
| name: Approve and merge dependabot PR | |||
| if: github.actor == 'dependabot[bot]' && (steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor') | |||
| run: gh pr review ${{ github.event.pull_request.number }} --approve -b "bors merge" | |||
| run: gh pr merge --auto --merge "$PR_URL" | |||
There was a problem hiding this comment.
There was a problem hiding this comment.
❌ This won't work:
This enables the pull request to be merged when any tests and approvals required by the branch protection rules are successfully met
You removed the approval, so when you enable auto-merge it will only start the merge once someone gives approval.
|
Haven't tested the auto merge though, but I can keep an eye in the next few days for it. The merging itself looks like it will mostly work, though we can use this PR as a test (but at least the required check is green here, so it picked it up properly). |
.github/workflows/build-test.yml
Outdated
| @@ -178,13 +192,15 @@ jobs: | |||
| - id: approve-and-merge-dependabot | |||
| name: Approve and merge dependabot PR | |||
| if: github.actor == 'dependabot[bot]' && (steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor') | |||
| run: gh pr review ${{ github.event.pull_request.number }} --approve -b "bors merge" | |||
| run: gh pr merge --auto --merge "$PR_URL" | |||
There was a problem hiding this comment.
❌ This won't work:
This enables the pull request to be merged when any tests and approvals required by the branch protection rules are successfully met
You removed the approval, so when you enable auto-merge it will only start the merge once someone gives approval.
|
Oh, right, I assumed the auto flag would do that. |
npepinpe
force-pushed
the
np-fix-automerge
branch
from
78befb1 to
61a0a70
Compare
Description
Fixes the CI workflow, specifically enabling it for merge queues (fixing the triggers to run) and also updating the auto merge job to use the GitHub CLI to just add to the merge queue.
Related issues
related to camunda/team-infrastructure#633
Definition of Done
Not all items need to be done depending on the issue and the pull request.
Code changes:
Testing:
Documentation: