From bb9ffc501f9f530071ab3c4fd1caa49d579aa2ed Mon Sep 17 00:00:00 2001 From: William Candillon Date: Wed, 20 Dec 2023 16:18:53 +0100 Subject: [PATCH 1/3] Update tests.yml concurrency group to not clash with npm publishing --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8aa2aa4d5b..794a8db37d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -6,7 +6,7 @@ jobs: env: WORKING_DIRECTORY: ./ concurrency: - group: npm-${{ github.ref }} + group: ci-${{ github.ref }} cancel-in-progress: true steps: - name: checkout From a6bf7f69a84f0294507b1f27e0a6b3891ed5074a Mon Sep 17 00:00:00 2001 From: William Candillon Date: Wed, 20 Dec 2023 19:09:33 +0100 Subject: [PATCH 2/3] :lipstick: --- .github/workflows/android-ubuntu.yml | 3 +++ externals/depot_tools | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android-ubuntu.yml b/.github/workflows/android-ubuntu.yml index a17257dfae..b81046248a 100644 --- a/.github/workflows/android-ubuntu.yml +++ b/.github/workflows/android-ubuntu.yml @@ -6,6 +6,9 @@ jobs: build: runs-on: ubuntu-latest timeout-minutes: 55 + concurrency: + group: ci-${{ github.ref }} + cancel-in-progress: true steps: - name: checkout uses: actions/checkout@v3 diff --git a/externals/depot_tools b/externals/depot_tools index 390005586b..007dd45a94 160000 --- a/externals/depot_tools +++ b/externals/depot_tools @@ -1 +1 @@ -Subproject commit 390005586bde14be9b55fde71ca4ae2107021ac9 +Subproject commit 007dd45a94b8fe400fb69113f7999fed185cb5c1 From 7aaddd78b5cc44606302756d64ad0c14b3161f18 Mon Sep 17 00:00:00 2001 From: William Candillon Date: Wed, 20 Dec 2023 19:13:26 +0100 Subject: [PATCH 3/3] More meaningful concurrency group names --- .github/workflows/android-ubuntu.yml | 2 +- .github/workflows/tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android-ubuntu.yml b/.github/workflows/android-ubuntu.yml index b81046248a..6c3713a3be 100644 --- a/.github/workflows/android-ubuntu.yml +++ b/.github/workflows/android-ubuntu.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 55 concurrency: - group: ci-${{ github.ref }} + group: android-unbuntu-${{ github.ref }} cancel-in-progress: true steps: - name: checkout diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 794a8db37d..61ea2e48e5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -6,7 +6,7 @@ jobs: env: WORKING_DIRECTORY: ./ concurrency: - group: ci-${{ github.ref }} + group: tests-${{ github.ref }} cancel-in-progress: true steps: - name: checkout