From 8be636ac59bda91f1e4cd9992b402c7432adbdf1 Mon Sep 17 00:00:00 2001 From: Ben Jervis Date: Wed, 1 May 2024 11:53:39 +1000 Subject: [PATCH 1/3] Allow actions to be triggered by merge queue --- .github/workflows/canary-release.yml | 1 + .github/workflows/ci.yml | 1 + .github/workflows/release.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/canary-release.yml b/.github/workflows/canary-release.yml index 0d06fffde50..8aa6e6eb5c4 100644 --- a/.github/workflows/canary-release.yml +++ b/.github/workflows/canary-release.yml @@ -4,6 +4,7 @@ name: canary-release on: + merge_group: push: branches: - v2 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 46e9ff57702..3b0e3cc1aaf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,7 @@ name: Continuous Integration on: + merge_group: pull_request: push: branches: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cb26e9f43f6..8c281c75670 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,7 @@ name: release on: + merge_group: workflow_call: inputs: release-command: From 42150b9f0f3972ba6145eca4443920c3ed1e578c Mon Sep 17 00:00:00 2001 From: Ben Jervis Date: Wed, 1 May 2024 11:55:37 +1000 Subject: [PATCH 2/3] Don't add it to release --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8c281c75670..cb26e9f43f6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,6 @@ name: release on: - merge_group: workflow_call: inputs: release-command: From 6a4417c497eefbc7c562003020bb1276467720af Mon Sep 17 00:00:00 2001 From: Ben Jervis Date: Wed, 1 May 2024 11:58:59 +1000 Subject: [PATCH 3/3] Don't do canary --- .github/workflows/canary-release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/canary-release.yml b/.github/workflows/canary-release.yml index 8aa6e6eb5c4..0d06fffde50 100644 --- a/.github/workflows/canary-release.yml +++ b/.github/workflows/canary-release.yml @@ -4,7 +4,6 @@ name: canary-release on: - merge_group: push: branches: - v2