Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 6 additions & 7 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ jobs:
steps:
- id: no_exclude
name: Run all builds
if: github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/') || (github.event_name == 'workflow_dispatch' && !startsWith(github.ref, 'refs/heads/version-bump/'))
# On scheduled runs, manual workflow dispatches (except automated dispatches on version-bump/*
# PR branches), and tag pushes, run the full matrix across all OSes and SDK channels.
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags/')
# On scheduled runs, manual workflow dispatches, and tag pushes, run the full matrix across
# all OSes and SDK channels.
run: echo 'excludes=[]' >> $GITHUB_OUTPUT
- id: exclude_master
name: Exclude beta and non-Linux builds on master
Expand All @@ -47,10 +47,9 @@ jobs:
run: echo 'excludes=[{"build-version":"beta"},{"os":"windows-latest"},{"os":"macos-latest"}]' >> $GITHUB_OUTPUT
- id: exclude_pr
name: Exclude beta, non-Linux, and secondary bots on PRs
if: github.event_name == 'pull_request' || (github.event_name == 'workflow_dispatch' && startsWith(github.ref, 'refs/heads/version-bump/'))
# To speed up CI on every PR (including automated workflow_dispatch runs on version-bump/*
# PR branches), in addition to excluding beta, Windows, and macOS, we also exclude
# secondary/slower bots.
if: github.event_name == 'pull_request'
# To speed up CI on every PR, in addition to excluding beta, Windows, and macOS, we also
# exclude secondary/slower bots.
run: echo 'excludes=[{"build-version":"beta"},{"os":"windows-latest"},{"os":"macos-latest"}]' >> $GITHUB_OUTPUT
- id: exclude_merge_group
name: Exclude all builds except misc if running on merge queue
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -314,10 +314,6 @@ jobs:
--body "Automated version bump after releasing v$VERSION."
fi

# PRs created with GITHUB_TOKEN do not trigger on: pull_request workflows automatically,
# so dispatch Run Tests on the PR branch so Merge Guard runs and allows merging.
gh workflow run build-and-test.yml --ref "$BRANCH_NAME"

- name: Print retry instructions on failure
if: failure() && steps.publish.outcome == 'success'
env:
Expand Down
Loading