From 7a66f5e6cd7831ac588ccbfe5b64317d95d3984f Mon Sep 17 00:00:00 2001 From: Peter Yates Date: Fri, 8 Mar 2024 14:31:47 +0000 Subject: [PATCH] Update config to enable merge queues * concurreny group switched from github.ref so that subsequent merges don't cancel in-progress deployments * don't build docker images when the event name is merge_group because these aren't 'real' branches, but they're phantom branches used in the merge queue to make sure future (actual) merges will build cleanly --- .github/workflows/aks_deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/aks_deploy.yml b/.github/workflows/aks_deploy.yml index 46abe72..f83e121 100644 --- a/.github/workflows/aks_deploy.yml +++ b/.github/workflows/aks_deploy.yml @@ -1,7 +1,7 @@ name: "Deploy" concurrency: - group: ${{ github.ref }} + group: ${{ github.head_ref || github.run_id }} cancel-in-progress: true on: @@ -193,7 +193,7 @@ jobs: docker: name: Build and push Docker image runs-on: ubuntu-latest - if: github.actor != 'dependabot[bot]' + if: github.actor != 'dependabot[bot]' && github.event_name != 'merge_group' outputs: docker-image: ${{ steps.build-docker-image.outputs.image }} steps: