Skip to content

Dispatch merge queue cancellation separately #29441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
electrum wants to merge 1 commit into
base: master
Choose a base branch
from
+82 −30
Open

Dispatch merge queue cancellation separately #29441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .github/bin/cancel-merge-queue-workflow.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/usr/bin/env bash

set -euo pipefail

name="$1"

echo "::error::Requesting merge queue workflow cancellation because ${name} failed"
if ! gh workflow run cancel-merge-queue-workflow.yml \
--repo "${GITHUB_REPOSITORY}" \
--ref "${GITHUB_REF_NAME}" \
-f run_id="${GITHUB_RUN_ID}" \
-f run_attempt="${GITHUB_RUN_ATTEMPT}"
then
echo "::warning::Failed to dispatch cancel-merge-queue-workflow.yml"
fi
57 changes: 57 additions & 0 deletions .github/workflows/cancel-merge-queue-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Cancel merge queue workflow

on:
workflow_dispatch:
inputs:
run_id:
description: Workflow run to cancel
required: true
run_attempt:
description: Workflow run attempt to cancel
required: true

defaults:
run:
shell: bash --noprofile --norc -euo pipefail {0}

permissions:
actions: write

jobs:
cancel:
runs-on: ubuntu-latest
steps:
- name: Cancel merge queue workflow after failure is recorded
env:
GH_TOKEN: ${{ github.token }}
RUN_ID: ${{ inputs.run_id }}
RUN_ATTEMPT: ${{ inputs.run_attempt }}
run: |
# Wait until GitHub records the failed job before cancelling the workflow, so the
# failing job keeps the failure conclusion instead of being finalized as cancelled.
for attempt in {1..30}; do
failed_jobs=$(gh api --paginate "/repos/${GITHUB_REPOSITORY}/actions/runs/${RUN_ID}/attempts/${RUN_ATTEMPT}/jobs" \
--jq '.jobs[] | select(.status == "completed" and .conclusion == "failure") | .name' \
| paste -sd ',' - \
| sed 's/,/, /g')
if [[ -n "${failed_jobs}" ]]; then
echo "::notice::Cancelling merge queue workflow after failed jobs were recorded: ${failed_jobs}"
run_status=$(gh api "/repos/${GITHUB_REPOSITORY}/actions/runs/${RUN_ID}" --jq .status)
if [[ "${run_status}" == "completed" ]]; then
echo "::notice::Workflow run ${RUN_ID} is already completed"
exit 0
fi
if ! gh run cancel "${RUN_ID}" --repo "${GITHUB_REPOSITORY}"; then
run_status=$(gh api "/repos/${GITHUB_REPOSITORY}/actions/runs/${RUN_ID}" --jq .status)
if [[ "${run_status}" == "completed" ]]; then
echo "::notice::Workflow run ${RUN_ID} completed before it could be cancelled"
exit 0
fi
exit 1
fi
exit 0
fi
sleep 2
done
echo "::warning::Failed to find a job with conclusion=failure for run ${RUN_ID} attempt ${RUN_ATTEMPT}; not cancelling workflow"
Comment thread
electrum marked this conversation as resolved.
exit 1
40 changes: 10 additions & 30 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,7 @@ jobs:
if: ${{ failure() && github.event_name == 'merge_group' }}
env:
GH_TOKEN: ${{ github.token }}
run: |
echo "::error::Cancelling merge queue workflow because maven-checks ${{ matrix.java-version }} failed"
gh run cancel "${GITHUB_RUN_ID}" --repo "${GITHUB_REPOSITORY}"
run: .github/bin/cancel-merge-queue-workflow.sh "maven-checks ${{ matrix.java-version }}"

artifact-checks:
needs: path-filters
Expand Down Expand Up @@ -145,9 +143,7 @@ jobs:
if: ${{ failure() && github.event_name == 'merge_group' }}
env:
GH_TOKEN: ${{ github.token }}
run: |
echo "::error::Cancelling merge queue workflow because artifact-checks failed"
gh run cancel "${GITHUB_RUN_ID}" --repo "${GITHUB_REPOSITORY}"
run: .github/bin/cancel-merge-queue-workflow.sh "artifact-checks"

check-commits-dispatcher:
needs: path-filters
Expand Down Expand Up @@ -237,9 +233,7 @@ jobs:
if: ${{ failure() && github.event_name == 'merge_group' }}
env:
GH_TOKEN: ${{ github.token }}
run: |
echo "::error::Cancelling merge queue workflow because error-prone-checks failed"
gh run cancel "${GITHUB_RUN_ID}" --repo "${GITHUB_REPOSITORY}"
run: .github/bin/cancel-merge-queue-workflow.sh "error-prone-checks"

test-jdbc-compatibility:
needs: path-filters
Expand Down Expand Up @@ -286,9 +280,7 @@ jobs:
if: ${{ failure() && github.event_name == 'merge_group' }}
env:
GH_TOKEN: ${{ github.token }}
run: |
echo "::error::Cancelling merge queue workflow because test-jdbc-compatibility failed"
gh run cancel "${GITHUB_RUN_ID}" --repo "${GITHUB_REPOSITORY}"
run: .github/bin/cancel-merge-queue-workflow.sh "test-jdbc-compatibility"

hive-tests:
needs: path-filters
Expand Down Expand Up @@ -351,9 +343,7 @@ jobs:
if: ${{ failure() && github.event_name == 'merge_group' }}
env:
GH_TOKEN: ${{ github.token }}
run: |
echo "::error::Cancelling merge queue workflow because hive-tests (${{ matrix.config }}) failed"
gh run cancel "${GITHUB_RUN_ID}" --repo "${GITHUB_REPOSITORY}"
run: .github/bin/cancel-merge-queue-workflow.sh "hive-tests (${{ matrix.config }})"

test-other-modules:
needs: path-filters
Expand Down Expand Up @@ -446,9 +436,7 @@ jobs:
if: ${{ failure() && github.event_name == 'merge_group' }}
env:
GH_TOKEN: ${{ github.token }}
run: |
echo "::error::Cancelling merge queue workflow because test-other-modules failed"
gh run cancel "${GITHUB_RUN_ID}" --repo "${GITHUB_REPOSITORY}"
run: .github/bin/cancel-merge-queue-workflow.sh "test-other-modules"

build-test-matrix:
needs: path-filters
Expand Down Expand Up @@ -569,9 +557,7 @@ jobs:
if: ${{ failure() && github.event_name == 'merge_group' }}
env:
GH_TOKEN: ${{ github.token }}
run: |
echo "::error::Cancelling merge queue workflow because build-test-matrix failed"
gh run cancel "${GITHUB_RUN_ID}" --repo "${GITHUB_REPOSITORY}"
run: .github/bin/cancel-merge-queue-workflow.sh "build-test-matrix"

test:
runs-on: 'ubuntu-latest'
Expand Down Expand Up @@ -876,9 +862,7 @@ jobs:
if: ${{ failure() && github.event_name == 'merge_group' }}
env:
GH_TOKEN: ${{ github.token }}
run: |
echo "::error::Cancelling merge queue workflow because test (${{ matrix.modules }}, ${{ matrix.profile }}, ${{ matrix.jdk }}) failed"
gh run cancel "${GITHUB_RUN_ID}" --repo "${GITHUB_REPOSITORY}"
run: .github/bin/cancel-merge-queue-workflow.sh "test (${{ matrix.modules }}, ${{ matrix.profile }}, ${{ matrix.jdk }})"

build-pt:
needs: path-filters
Expand Down Expand Up @@ -1079,9 +1063,7 @@ jobs:
if: ${{ failure() && github.event_name == 'merge_group' }}
env:
GH_TOKEN: ${{ github.token }}
run: |
echo "::error::Cancelling merge queue workflow because build-pt failed"
gh run cancel "${GITHUB_RUN_ID}" --repo "${GITHUB_REPOSITORY}"
run: .github/bin/cancel-merge-queue-workflow.sh "build-pt"

pt:
runs-on: 'ubuntu-latest'
Expand Down Expand Up @@ -1176,9 +1158,7 @@ jobs:
if: ${{ failure() && github.event_name == 'merge_group' }}
env:
GH_TOKEN: ${{ github.token }}
run: |
echo "::error::Cancelling merge queue workflow because pt (${{ matrix.config }}, ${{ matrix.suite }}, ${{ matrix.jdk }}) failed"
gh run cancel "${GITHUB_RUN_ID}" --repo "${GITHUB_REPOSITORY}"
run: .github/bin/cancel-merge-queue-workflow.sh "pt (${{ matrix.config }}, ${{ matrix.suite }}, ${{ matrix.jdk }})"

build-success:
if: ${{ always() }} # if `failure()` would not work for cancellations, `!success()` would not work for skipped jobs
Expand Down