Review feedback

This commit is contained in:
Bart Thomee
2025-10-17 12:32:44 -04:00
parent 7d9b2dbd10
commit a3fa2bd1c5
2 changed files with 12 additions and 13 deletions

View File

@@ -26,9 +26,9 @@ defaults:
jobs:
# This job determines whether the rest of the workflow should run. It runs
# when the PR is not a draft (which should also cover merge-group) or
# has the 'DraftRunCI' label.
# has the 'DraftRunCI' or 'SkipRunCI' labels.
should-run:
if: ${{ !github.event.pull_request.draft || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
if: ${{ !github.event.pull_request.draft || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') || contains(github.event.pull_request.labels.*.name, 'SkipRunCI') }}
runs-on: ubuntu-latest
steps:
- name: Checkout repository
@@ -75,22 +75,21 @@ jobs:
conanfile.py
conan.lock
- name: Check whether to run
# This step determines whether the rest of the workflow should
# run. The rest of the workflow will run if this job runs AND at
# least one of:
# * Any of the files checked in the `changes` step were modified
# * The PR is NOT a draft, is labeled "Ready to merge", and is NOT
# labeled "SkipRunCI".
# * The workflow is running from the merge queue
# This step determines whether the rest of the workflow should run. The
# rest of the workflow will run if this job runs AND at least one of:
# * Any of the files checked in the `changes` step were modified.
# * The PR is NOT a draft, is labeled 'Ready to merge', and is NOT
# labeled 'MergeQueueCI'.
# * The workflow is running from the merge queue.
id: go
env:
FILES: ${{ steps.changes.outputs.any_changed }}
DRAFT: ${{ github.event.pull_request.draft }}
READY: ${{ contains(github.event.pull_request.labels.*.name, 'Ready to merge') }}
MERGE: ${{ github.event_name == 'merge_group' }}
SKIP: ${{ contains(github.event.pull_request.labels.*.name, 'SkipRunCI') }}
MQCI: ${{ contains(github.event.pull_request.labels.*.name, 'MergeQueueCI') }}
run: |
echo "go=${{ (env.DRAFT != 'true' && env.READY == 'true' && env.SKIP != 'true') || env.FILES == 'true' || env.MERGE == 'true' }}" >> "${GITHUB_OUTPUT}"
echo "go=${{ (env.DRAFT != 'true' && env.READY == 'true' && env.MQCI != 'true') || env.FILES == 'true' || env.MERGE == 'true' }}" >> "${GITHUB_OUTPUT}"
cat "${GITHUB_OUTPUT}"
outputs:
go: ${{ steps.go.outputs.go == 'true' }}

View File

@@ -92,7 +92,7 @@ if [ "${remote}" = "origin" ]; then
This script will not push. Verify everything is correct, then force
push to the source branch using the following commands:
gh pr edit ${pr} --add-label 'SkipRunCI'
gh pr edit ${pr} --add-label 'MergeQueueCI'
git push --force-with-lease origin ${source}
The first command adds a label to the PR to skip running CI on the new
@@ -111,7 +111,7 @@ else
This script will not push. Verify everything is correct, then force
push to the fork using the following commands:
gh pr edit ${pr} --add-label 'SkipRunCI'
gh pr edit ${pr} --add-label 'MergeQueueCI'
git remote add ${remote} git@github.com:${remote}/rippled.git
git fetch ${remote}
git push --force-with-lease ${remote} ${source}