From 68f4a1b747cb93a4a9114f4c1b9392ff7a58950f Mon Sep 17 00:00:00 2001 From: James Elliott Date: Sat, 14 Feb 2026 21:59:25 +1100 Subject: [PATCH 1/2] ci: update renovate --- .renovaterc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.renovaterc b/.renovaterc index 525840a..fa1096a 100644 --- a/.renovaterc +++ b/.renovaterc @@ -18,7 +18,8 @@ "github-actions" ], "postUpdateOptions": [ - "gomodTidy" + "gomodTidy", + "gomodMassage" ], "branchPrefix": "renovate-", "rebaseWhen": "conflicted", From 08148b375307aea21a452e005236ed844ce022b7 Mon Sep 17 00:00:00 2001 From: James Elliott Date: Sat, 14 Feb 2026 22:17:52 +1100 Subject: [PATCH 2/2] ci: run workflows in merge group --- .github/workflows/codeql.yml | 3 +++ .github/workflows/dependency-review.yml | 7 ++++++- .github/workflows/go.yml | 9 +++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index b92a995..fe741bf 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -6,6 +6,9 @@ on: pull_request: branches: - 'master' + merge_group: + branches: + - 'master' schedule: - cron: '0 0 * * 1' permissions: diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index a978437..0de125c 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -1,6 +1,11 @@ name: 'Dependency Review' on: - pull_request: {} + pull_request: + branches: + - 'master' + merge_group: + branches: + - 'master' permissions: contents: 'read' jobs: diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index f7c888d..3cd2233 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -1,9 +1,14 @@ name: 'Go' on: - pull_request: {} + pull_request: + branches: + - 'master' push: branches: - 'master' + merge_group: + branches: + - 'master' permissions: contents: 'read' jobs: @@ -60,4 +65,4 @@ jobs: go build -v ./... - name: 'Test' run: | - go test -v ./... \ No newline at end of file + go test -v ./...