Skip to content

ci: Don't let heavy jobs block merge-queue entry in PRs #2274

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
cgwalters wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −4
Open

ci: Don't let heavy jobs block merge-queue entry in PRs #2274

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
30 changes: 26 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,10 +558,12 @@ jobs:
name: container-export-test-${{ env.ARCH }}
path: target/anaconda-test/*.log

# Sentinel job for required checks - configure this job name in repository settings.
# Accepts 'skipped' as success so that merge_group-only jobs don't block PRs.
required-checks:
if: always()
# Runs only in merge_group / workflow_dispatch and gates the full heavy suite.
# Skipped on PRs, so required-checks (below) sees it as 'skipped' == success there.
# Uses always() so it still reports a failure when an upstream heavy job failed,
# rather than being skipped along with it.
required-checks-merge:
if: ${{ always() && (github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch') }}
needs: [compute-ci-level, cargo-deny, validate, install-tests, docs, package, test-integration, test-upgrade, test-baseconfigs, test-container-export]
runs-on: ubuntu-latest
steps:
Expand All @@ -574,3 +576,23 @@ jobs:
echo "The following jobs did not succeed: $FAILED"
exit 1
fi

# Sentinel job — configure this single name in repo required-status-checks settings.
# On PRs: gates only the light always-run jobs; required-checks-merge is skipped
# (treated as success) so ci/merge heavy jobs run for feedback but don't block
# merge-queue entry — those jobs run again in the queue anyway with fresh artifacts.
# In merge_group: required-checks-merge has already verified the full suite above.
required-checks:
if: always()
needs: [compute-ci-level, validate, cargo-deny, docs, required-checks-merge]
runs-on: ubuntu-latest
steps:
- name: Check required jobs
env:
NEEDS: ${{ toJson(needs) }}
run: |
FAILED=$(echo "$NEEDS" | jq -r 'to_entries[] | select(.value.result | IN("success","skipped") | not) | .key')
Comment thread
cgwalters marked this conversation as resolved.
if [ -n "$FAILED" ]; then
echo "The following jobs did not succeed: $FAILED"
exit 1
fi
Loading