Skip to content

ci: support merge queues #1124

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

Draft
chaptersix wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

ci: support merge queues #1124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29344b8
ci: run required checks for merge groups
chaptersix Jul 11, 2026
f379d9c
ci: verify Go modules are tidy
chaptersix Jul 11, 2026
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: 14 additions & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: Continuous Integration
on:
pull_request:
merge_group:
types: [checks_requested]
push:
branches:
- main
Expand All @@ -12,7 +14,7 @@ permissions:
jobs:
validate-server-version:
name: Validate Server Version
if: github.event_name == 'push' || github.base_ref == 'main'
if: github.event_name == 'push' || github.event_name == 'merge_group' || github.base_ref == 'main'
runs-on: ubuntu-latest
steps:
- name: Checkout repository
Expand Down Expand Up @@ -79,6 +81,17 @@ jobs:
path: junit-xml
retention-days: 14

- name: Tidy modules, confirm unchanged
if: ${{ matrix.checkGenCommands }}
shell: bash
run: |
go mod tidy
(
cd cliext
go mod tidy
)
git diff --exit-code -- go.mod go.sum cliext/go.mod cliext/go.sum

- name: Regen code, confirm unchanged
if: ${{ matrix.checkGenCommands }}
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/govulncheck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: Govulncheck

on:
pull_request:
merge_group:
types: [checks_requested]

permissions:
contents: read
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,8 +409,6 @@ github.com/temporalio/sqlparser v0.0.0-20231115171017-f4060bcfa6cb/go.mod h1:143
github.com/temporalio/tchannel-go v1.22.1-0.20220818200552-1be8d8cffa5b/go.mod h1:c+V9Z/ZgkzAdyGvHrvC5AsXgN+M9Qwey04cBdKYzV7U=
github.com/temporalio/tchannel-go v1.22.1-0.20260129151045-8706a1ab5f61 h1:v9EBEMJggmXGbVcIAjGQpKgEB+a9E/Q0brJ6fGWJvhQ=
github.com/temporalio/tchannel-go v1.22.1-0.20260129151045-8706a1ab5f61/go.mod h1:ezRQRwu9KQXy8Wuuv1aaFFxoCNz5CeNbVOOkh3xctbY=
github.com/temporalio/ui-server/v2 v2.50.1 h1:dlyg96lFwOIaiXywDzPnSXVf8GPULLfrXXVXGqRsvJY=
github.com/temporalio/ui-server/v2 v2.50.1/go.mod h1:jiWHDxRe4RDXLxGwenfV+FSgjXat81okVTTZPQOlc3c=
github.com/temporalio/ui-server/v2 v2.52.0 h1:BJ5e1teLOITbn4G9zZTuDOsROonI0uRThGlzaQ1aMxs=
github.com/temporalio/ui-server/v2 v2.52.0/go.mod h1:HKjuLT3J/hM1nRN6Vge2Z63tPWPNUVR/2+5CMbkBQns=
github.com/tidwall/btree v1.8.1 h1:27ehoXvm5AG/g+1VxLS1SD3vRhp/H7LuEfwNvddEdmA=
Expand Down
Loading