From c5bcb6e69daea056e39b56309ea196a7e4041a4d Mon Sep 17 00:00:00 2001 From: Joshua Colvin Date: Wed, 27 Sep 2023 14:17:27 -0700 Subject: [PATCH] Add `merge_group` to workflows to prepare for merge queues --- .github/workflows/arbitrator-ci.yml | 1 + .github/workflows/arbitrator-skip-ci.yml | 1 + .github/workflows/ci.yml | 1 + .github/workflows/codeql-analysis.yml | 2 ++ .github/workflows/docker.yml | 1 + 5 files changed, 6 insertions(+) diff --git a/.github/workflows/arbitrator-ci.yml b/.github/workflows/arbitrator-ci.yml index ae25171859..f2b141fb46 100644 --- a/.github/workflows/arbitrator-ci.yml +++ b/.github/workflows/arbitrator-ci.yml @@ -3,6 +3,7 @@ run-name: Arbitrator CI triggered from @${{ github.actor }} of ${{ github.head_r on: workflow_dispatch: + merge_group: pull_request: paths: - 'arbitrator/**' diff --git a/.github/workflows/arbitrator-skip-ci.yml b/.github/workflows/arbitrator-skip-ci.yml index 6dfd962ee6..75fb47d0a5 100644 --- a/.github/workflows/arbitrator-skip-ci.yml +++ b/.github/workflows/arbitrator-skip-ci.yml @@ -2,6 +2,7 @@ name: Arbitrator skip CI run-name: Arbitrator skip CI triggered from @${{ github.actor }} of ${{ github.head_ref }} on: + merge_group: pull_request: paths-ignore: - 'arbitrator/**' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a0f5251f9f..0734aecfd0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,6 +3,7 @@ run-name: Go tests CI triggered from @${{ github.actor }} of ${{ github.head_ref on: workflow_dispatch: + merge_group: pull_request: push: branches: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e4aacdcd65..cfb5b6eda6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -14,6 +14,8 @@ name: "CodeQL" on: push: branches: [ "master" ] + merge_group: + branches: [ "master" ] pull_request: # The branches below must be a subset of the branches above branches: [ "master" ] diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d391dd4096..6192f65a4e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -3,6 +3,7 @@ run-name: Docker build CI triggered from @${{ github.actor }} of ${{ github.head on: workflow_dispatch: + merge_group: pull_request: push: branches: