From 0ad19980be99cb2f669d38c2f1410a38206cbe74 Mon Sep 17 00:00:00 2001 From: Jeremy Leibs Date: Wed, 26 Apr 2023 05:15:48 +0200 Subject: [PATCH] Jobs with duplicated instances still need separate concurrency keys based on platform --- .github/workflows/manual_build_wheels_for_pr.yml | 16 ++++++++-------- .github/workflows/manual_dispatch.yml | 16 ++++++++-------- .github/workflows/on_push_main.yml | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/manual_build_wheels_for_pr.yml b/.github/workflows/manual_build_wheels_for_pr.yml index f61ec31acc6e..4f9c23beee09 100644 --- a/.github/workflows/manual_build_wheels_for_pr.yml +++ b/.github/workflows/manual_build_wheels_for_pr.yml @@ -32,7 +32,7 @@ jobs: name: 'Linux: Build/Test Wheels' uses: ./.github/workflows/reusable_build_and_test_wheels.yml with: - CONCURRENCY: manual-wheels-${{ needs.check-for-pr.outputs.PR_NUMBER }} + CONCURRENCY: manual-wheels-linux-${{ needs.check-for-pr.outputs.PR_NUMBER }} PLATFORM: linux WHEEL_ARTIFACT_NAME: linux-wheel RRD_ARTIFACT_NAME: linux-rrd @@ -43,7 +43,7 @@ jobs: name: 'Windows: Build/Test Wheels' uses: ./.github/workflows/reusable_build_and_test_wheels.yml with: - CONCURRENCY: manual-wheels-${{ needs.check-for-pr.outputs.PR_NUMBER }} + CONCURRENCY: manual-wheels-windows-${{ needs.check-for-pr.outputs.PR_NUMBER }} PLATFORM: windows WHEEL_ARTIFACT_NAME: windows-wheel RRD_ARTIFACT_NAME: '' @@ -54,7 +54,7 @@ jobs: name: 'Macos-Arm: Build/Test Wheels' uses: ./.github/workflows/reusable_build_and_test_wheels.yml with: - CONCURRENCY: manual-wheels-${{ needs.check-for-pr.outputs.PR_NUMBER }} + CONCURRENCY: manual-wheels-macos-arm-${{ needs.check-for-pr.outputs.PR_NUMBER }} PLATFORM: macos-arm WHEEL_ARTIFACT_NAME: macos-arm-wheel RRD_ARTIFACT_NAME: '' @@ -65,7 +65,7 @@ jobs: name: 'Macos-Intel: Build/Test Wheels' uses: ./.github/workflows/reusable_build_and_test_wheels.yml with: - CONCURRENCY: manual-wheels-${{ needs.check-for-pr.outputs.PR_NUMBER }} + CONCURRENCY: manual-wheels-macos-intel-${{ needs.check-for-pr.outputs.PR_NUMBER }} PLATFORM: macos-intel WHEEL_ARTIFACT_NAME: 'macos-intel-wheel' RRD_ARTIFACT_NAME: '' @@ -76,7 +76,7 @@ jobs: needs: [build-linux] uses: ./.github/workflows/reusable_upload_wheels.yml with: - CONCURRENCY: manual-wheels-${{ needs.check-for-pr.outputs.PR_NUMBER }} + CONCURRENCY: manual-wheels-linux-${{ needs.check-for-pr.outputs.PR_NUMBER }} WHEEL_ARTIFACT_NAME: linux-wheel RRD_ARTIFACT_NAME: linux-rrd secrets: inherit @@ -86,7 +86,7 @@ jobs: needs: [build-linux, build-windows] uses: ./.github/workflows/reusable_upload_wheels.yml with: - CONCURRENCY: manual-wheels-${{ needs.check-for-pr.outputs.PR_NUMBER }} + CONCURRENCY: manual-wheels-windows-${{ needs.check-for-pr.outputs.PR_NUMBER }} WHEEL_ARTIFACT_NAME: windows-wheel RRD_ARTIFACT_NAME: linux-rrd secrets: inherit @@ -96,7 +96,7 @@ jobs: needs: [build-linux, build-macos-arm] uses: ./.github/workflows/reusable_upload_wheels.yml with: - CONCURRENCY: manual-wheels-${{ needs.check-for-pr.outputs.PR_NUMBER }} + CONCURRENCY: manual-wheels--macos-arm-${{ needs.check-for-pr.outputs.PR_NUMBER }} WHEEL_ARTIFACT_NAME: macos-arm-wheel RRD_ARTIFACT_NAME: linux-rrd secrets: inherit @@ -106,7 +106,7 @@ jobs: needs: [build-linux, build-macos-intel] uses: ./.github/workflows/reusable_upload_wheels.yml with: - CONCURRENCY: manual-wheels-${{ needs.check-for-pr.outputs.PR_NUMBER }} + CONCURRENCY: manual-wheels-macos-intel-${{ needs.check-for-pr.outputs.PR_NUMBER }} WHEEL_ARTIFACT_NAME: macos-intel-wheel RRD_ARTIFACT_NAME: linux-rrd secrets: inherit diff --git a/.github/workflows/manual_dispatch.yml b/.github/workflows/manual_dispatch.yml index 72f46a152820..43722ddde620 100644 --- a/.github/workflows/manual_dispatch.yml +++ b/.github/workflows/manual_dispatch.yml @@ -118,7 +118,7 @@ jobs: uses: ./.github/workflows/reusable_build_and_test_wheels.yml with: - CONCURRENCY: manual-dispatch-${{ github.run_id}} + CONCURRENCY: manual-dispatch-linux-${{ github.run_id}} SAVE_CACHE: ${{ github.event.inputs.SAVE_CACHE == 'true' }} PLATFORM: linux WHEEL_ARTIFACT_NAME: linux-wheel @@ -131,7 +131,7 @@ jobs: if: ${{ contains(github.event.inputs.WHEEL_PLATFORMS, 'windows') }} uses: ./.github/workflows/reusable_build_and_test_wheels.yml with: - CONCURRENCY: manual-dispatch-${{ github.run_id}} + CONCURRENCY: manual-dispatch-windows-${{ github.run_id}} SAVE_CACHE: ${{ github.event.inputs.SAVE_CACHE == 'true' }} PLATFORM: windows WHEEL_ARTIFACT_NAME: windows-wheel @@ -144,7 +144,7 @@ jobs: if: ${{ contains(github.event.inputs.WHEEL_PLATFORMS, 'macos-arm') }} uses: ./.github/workflows/reusable_build_and_test_wheels.yml with: - CONCURRENCY: manual-dispatch-${{ github.run_id}} + CONCURRENCY: manual-dispatch-macos-arm-${{ github.run_id}} SAVE_CACHE: ${{ github.event.inputs.SAVE_CACHE == 'true' }} PLATFORM: macos-arm WHEEL_ARTIFACT_NAME: macos-arm-wheel @@ -157,7 +157,7 @@ jobs: if: ${{ contains(github.event.inputs.WHEEL_PLATFORMS, 'macos-intel') }} uses: ./.github/workflows/reusable_build_and_test_wheels.yml with: - CONCURRENCY: manual-dispatch-${{ github.run_id}} + CONCURRENCY: manual-dispatch-macos-intel-${{ github.run_id}} SAVE_CACHE: ${{ github.event.inputs.SAVE_CACHE == 'true' }} PLATFORM: macos-intel WHEEL_ARTIFACT_NAME: 'macos-intel-wheel' @@ -172,7 +172,7 @@ jobs: if: ${{ contains(github.event.inputs.WHEEL_PLATFORMS, 'linux') && (github.event.inputs.UPLOAD_GCLOUD == 'true') }} uses: ./.github/workflows/reusable_upload_wheels.yml with: - CONCURRENCY: manual-dispatch-${{ github.run_id}} + CONCURRENCY: manual-dispatch-linux-${{ github.run_id}} WHEEL_ARTIFACT_NAME: linux-wheel RRD_ARTIFACT_NAME: linux-rrd secrets: inherit @@ -183,7 +183,7 @@ jobs: if: ${{ contains(github.event.inputs.WHEEL_PLATFORMS, 'windows') && (github.event.inputs.UPLOAD_GCLOUD == 'true') }} uses: ./.github/workflows/reusable_upload_wheels.yml with: - CONCURRENCY: manual-dispatch-${{ github.run_id}} + CONCURRENCY: manual-dispatch-windows-${{ github.run_id}} WHEEL_ARTIFACT_NAME: windows-wheel RRD_ARTIFACT_NAME: linux-rrd secrets: inherit @@ -194,7 +194,7 @@ jobs: if: ${{ contains(github.event.inputs.WHEEL_PLATFORMS, 'macos-arm') && (github.event.inputs.UPLOAD_GCLOUD == 'true') }} uses: ./.github/workflows/reusable_upload_wheels.yml with: - CONCURRENCY: manual-dispatch-${{ github.run_id}} + CONCURRENCY: manual-dispatch-macos-arm-${{ github.run_id}} WHEEL_ARTIFACT_NAME: macos-arm-wheel RRD_ARTIFACT_NAME: linux-rrd secrets: inherit @@ -205,7 +205,7 @@ jobs: if: ${{ contains(github.event.inputs.WHEEL_PLATFORMS, 'macos-intel') && (github.event.inputs.UPLOAD_GCLOUD == 'true') }} uses: ./.github/workflows/reusable_upload_wheels.yml with: - CONCURRENCY: manual-dispatch-${{ github.run_id}} + CONCURRENCY: manual-dispatch-macos-intel-${{ github.run_id}} WHEEL_ARTIFACT_NAME: macos-intel-wheel RRD_ARTIFACT_NAME: linux-rrd secrets: inherit diff --git a/.github/workflows/on_push_main.yml b/.github/workflows/on_push_main.yml index d9ee93fd73c5..59d759f63aa3 100644 --- a/.github/workflows/on_push_main.yml +++ b/.github/workflows/on_push_main.yml @@ -55,7 +55,7 @@ jobs: name: 'Linux: Build/Test Wheels' uses: ./.github/workflows/reusable_build_and_test_wheels.yml with: - CONCURRENCY: push-${{ github.ref_name }} + CONCURRENCY: push-linux-${{ github.ref_name }} PLATFORM: linux WHEEL_ARTIFACT_NAME: linux-wheel RRD_ARTIFACT_NAME: linux-rrd @@ -66,7 +66,7 @@ jobs: name: 'Windows: Build/Test Wheels' uses: ./.github/workflows/reusable_build_and_test_wheels.yml with: - CONCURRENCY: push-${{ github.ref_name }} + CONCURRENCY: push-windows-${{ github.ref_name }} PLATFORM: windows WHEEL_ARTIFACT_NAME: windows-wheel RRD_ARTIFACT_NAME: '' @@ -77,7 +77,7 @@ jobs: name: 'Macos-Arm: Build/Test Wheels' uses: ./.github/workflows/reusable_build_and_test_wheels.yml with: - CONCURRENCY: push-${{ github.ref_name }} + CONCURRENCY: push-macos-arm-${{ github.ref_name }} PLATFORM: macos-arm WHEEL_ARTIFACT_NAME: macos-arm-wheel RRD_ARTIFACT_NAME: '' @@ -88,7 +88,7 @@ jobs: name: 'Macos-Intel: Build/Test Wheels' uses: ./.github/workflows/reusable_build_and_test_wheels.yml with: - CONCURRENCY: push-${{ github.ref_name }} + CONCURRENCY: push-macos-intel-${{ github.ref_name }} PLATFORM: macos-intel WHEEL_ARTIFACT_NAME: 'macos-intel-wheel' RRD_ARTIFACT_NAME: '' @@ -99,7 +99,7 @@ jobs: needs: [build-linux] uses: ./.github/workflows/reusable_upload_wheels.yml with: - CONCURRENCY: push-${{ github.ref_name }} + CONCURRENCY: push-linux-${{ github.ref_name }} WHEEL_ARTIFACT_NAME: linux-wheel RRD_ARTIFACT_NAME: linux-rrd secrets: inherit @@ -109,7 +109,7 @@ jobs: needs: [build-linux, build-windows] uses: ./.github/workflows/reusable_upload_wheels.yml with: - CONCURRENCY: push-${{ github.ref_name }} + CONCURRENCY: push-windows-${{ github.ref_name }} WHEEL_ARTIFACT_NAME: windows-wheel RRD_ARTIFACT_NAME: linux-rrd secrets: inherit @@ -119,7 +119,7 @@ jobs: needs: [build-linux, build-macos-arm] uses: ./.github/workflows/reusable_upload_wheels.yml with: - CONCURRENCY: push-${{ github.ref_name }} + CONCURRENCY: push-macos-arm-${{ github.ref_name }} WHEEL_ARTIFACT_NAME: macos-arm-wheel RRD_ARTIFACT_NAME: linux-rrd secrets: inherit @@ -129,7 +129,7 @@ jobs: needs: [build-linux, build-macos-intel] uses: ./.github/workflows/reusable_upload_wheels.yml with: - CONCURRENCY: push-${{ github.ref_name }} + CONCURRENCY: push-macos-intel-${{ github.ref_name }} WHEEL_ARTIFACT_NAME: macos-intel-wheel RRD_ARTIFACT_NAME: linux-rrd secrets: inherit