From 7d1e748b0efd5aafdb4d482f7c4e228e0735ea88 Mon Sep 17 00:00:00 2001 From: Matt Morley Date: Mon, 18 Nov 2024 21:15:40 -0800 Subject: [PATCH] Enable merge groups --- .github/workflows/build.yml | 1 + .github/workflows/lint-format.yml | 1 + .github/workflows/photon-code-docs.yml | 1 + .github/workflows/photonvision-docs.yml | 1 + .github/workflows/python.yml | 1 + 5 files changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 78aeee5ff3..0335c358b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,6 +16,7 @@ on: - '**' - '!docs/**' - '.github/**' + merge_group: jobs: build-client: diff --git a/.github/workflows/lint-format.yml b/.github/workflows/lint-format.yml index 7e710c16f9..10af231467 100644 --- a/.github/workflows/lint-format.yml +++ b/.github/workflows/lint-format.yml @@ -16,6 +16,7 @@ on: - '**' - '!docs/**' - '.github/**' + merge_group: concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} diff --git a/.github/workflows/photon-code-docs.yml b/.github/workflows/photon-code-docs.yml index a8bb9f69fd..11d87041fd 100644 --- a/.github/workflows/photon-code-docs.yml +++ b/.github/workflows/photon-code-docs.yml @@ -16,6 +16,7 @@ on: - '**' - '!docs/**' - '.github/**' + merge_group: # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages permissions: diff --git a/.github/workflows/photonvision-docs.yml b/.github/workflows/photonvision-docs.yml index fd520c10bb..9ef25f8b80 100644 --- a/.github/workflows/photonvision-docs.yml +++ b/.github/workflows/photonvision-docs.yml @@ -11,6 +11,7 @@ on: paths: - 'docs/**' - '.github/**' + merge_group: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 24b1def225..dd261cf70c 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -18,6 +18,7 @@ on: - '**' - '!docs/**' - '.github/**' + merge_group: jobs: buildAndDeploy: