Skip to content
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

ci: Properly enable merge-queue #468

Merged
merged 2 commits into from
Jan 27, 2025
Merged

ci: Properly enable merge-queue #468

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3a076f
ci: Properly enable merge-queue
ko3n1g Dec 20, 2024
c4131c8
add merge-queue condition
ko3n1g Jan 27, 2025
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
5 changes: 4 additions & 1 deletion .github/workflows/cicd-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ on:
- 'r**'
- 'dev'
types: [labeled]
merge_group:
ko3n1g marked this conversation as resolved.
Show resolved Hide resolved
types: [checks_requested]
workflow_dispatch:
inputs:
test_to_run:
Expand Down Expand Up @@ -74,6 +76,7 @@ jobs:
CHANGED_SRC: ${{ steps.changed-files.outputs.src_all_changed_files }}
IS_PULLREQUEST: ${{ github.event_name == 'pull_request' }}
LABEL: ${{ github.event.label.name == 'Run CICD' }}
MERGE_GROUP: ${{ github.event_name == 'merge_group' }}
run: |
# Some output that's helpful for debugging
echo "Docs changed: $CHANGED_DOCS"
Expand All @@ -84,7 +87,7 @@ jobs:
echo "IS_PULLREQUEST: $IS_PULLREQUEST"

# Run CI only (on main or if label is attached) and if it's not only docs
echo run_ci=$([[ ("$LABEL" = "true" || "$IS_PULLREQUEST" = "false") && "$DOCS_ONLY" = "false" ]] && echo "true" || echo "false") | tee -a "$GITHUB_OUTPUT"
echo run_ci=$([[ ("$LABEL" = "true" || "$IS_PULLREQUEST" = "false" || "$MERGE_GROUP" = "true") && "$DOCS_ONLY" = "false" ]] && echo "true" || echo "false") | tee -a "$GITHUB_OUTPUT"

build-container:
if: ${{ needs.pre-flight.outputs.run_ci == 'true' }}
Expand Down
Loading