From eeeebecb44daf4aa33ae935095ddf4660548b5da Mon Sep 17 00:00:00 2001 From: Igor Sarkisov Date: Wed, 16 Aug 2023 10:40:19 -0700 Subject: [PATCH] Add github.event.action to GA workflow concurrency. (#1280) This context variable should make GitHub differentiate between workflows triggered via pull request push vs label event. b/296137226 (cherry picked from commit bdfebab3b1588c7971debdb61936beeccc7afe03) --- .github/workflows/main.yaml | 4 ++++ .github/workflows/main_win.yaml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index a79fe3beaf3e..f63553f9ecdd 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -33,7 +33,11 @@ env: STARBOARD_TOOLCHAINS_DIR: /root/starboard-toolchains concurrency: +<<<<<<< HEAD group: '${{ github.workflow }}-${{ inputs.platform }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.sha }}' +======= + group: '${{ github.workflow }}-${{ github.event_name }}-${{ github.event.action }}-${{ inputs.platform }} @ ${{ github.event.pull_request.number || github.sha }}' +>>>>>>> bdfebab3b15 (Add github.event.action to GA workflow concurrency. (#1280)) cancel-in-progress: true # A workflow run is made up of one or more jobs that can run sequentially or in parallel diff --git a/.github/workflows/main_win.yaml b/.github/workflows/main_win.yaml index c3d6df5275dc..1697cc57e92d 100644 --- a/.github/workflows/main_win.yaml +++ b/.github/workflows/main_win.yaml @@ -33,7 +33,11 @@ env: STARBOARD_TOOLCHAINS_DIR: /root/starboard-toolchains concurrency: +<<<<<<< HEAD group: '${{ github.workflow }}-${{ inputs.platform }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.sha }}' +======= + group: '${{ github.workflow }}-${{ github.event_name }}-${{ github.event.action }}-${{ inputs.platform }} @ ${{ github.event.pull_request.number || github.sha }}' +>>>>>>> bdfebab3b15 (Add github.event.action to GA workflow concurrency. (#1280)) cancel-in-progress: true # A workflow run is made up of one or more jobs that can run sequentially or in parallel