From 6720787deef06982d177a0a22734a291e10e7526 Mon Sep 17 00:00:00 2001 From: silverqx Date: Sun, 21 Apr 2024 18:58:36 +0200 Subject: [PATCH] workflows bugfix concurrency Run gh workflow run only once, one matrix combination. --- .github/workflows/linux-qt6-drivers.yml | 1 + .github/workflows/msvc2022-qt6-drivers.yml | 1 + .github/workflows/vcpkg-linux-drivers.yml | 1 + .github/workflows/vcpkg-linux.yml | 1 + .github/workflows/vcpkg-windows-drivers.yml | 1 + .github/workflows/vcpkg-windows.yml | 1 + 6 files changed, 6 insertions(+) diff --git a/.github/workflows/linux-qt6-drivers.yml b/.github/workflows/linux-qt6-drivers.yml index ec923a776..6d01b6243 100644 --- a/.github/workflows/linux-qt6-drivers.yml +++ b/.github/workflows/linux-qt6-drivers.yml @@ -248,6 +248,7 @@ jobs: # one will be in_progress and the second will be queued (waiting until the first finish), # and all others will be canceled. - name: Run vcpkg-linux.yml workflows + if: matrix.build-type.key == 'debug' && matrix.compiler.key == 'clang18' working-directory: ${{ env.TinyORMPath }} run: | gh workflow run vcpkg-linux.yml --ref ${{ github.ref_name }} diff --git a/.github/workflows/msvc2022-qt6-drivers.yml b/.github/workflows/msvc2022-qt6-drivers.yml index 4ad438c19..4cf674ccb 100644 --- a/.github/workflows/msvc2022-qt6-drivers.yml +++ b/.github/workflows/msvc2022-qt6-drivers.yml @@ -276,6 +276,7 @@ jobs: # one will be in_progress and the second will be queued (waiting until the first finish), # and all others will be canceled. - name: Run vcpkg-windows.yml workflows + if: matrix.drivers-type == 'Shared' && matrix.build-type.key == 'debug' working-directory: ${{ env.TinyORMPath }} run: | gh workflow run vcpkg-windows.yml --ref ${{ github.ref_name }} diff --git a/.github/workflows/vcpkg-linux-drivers.yml b/.github/workflows/vcpkg-linux-drivers.yml index 91345e7d2..d103c818b 100644 --- a/.github/workflows/vcpkg-linux-drivers.yml +++ b/.github/workflows/vcpkg-linux-drivers.yml @@ -455,6 +455,7 @@ jobs: # one will be in_progress and the second will be queued (waiting until the first finish), # and all others will be canceled. - name: Run analyzers.yml workflows + if: matrix.build-type.key == 'debug' && matrix.qt.key == 'qt6' working-directory: ${{ env.TinyORMPath }} run: | gh workflow run analyzers.yml --ref ${{ github.ref_name }} diff --git a/.github/workflows/vcpkg-linux.yml b/.github/workflows/vcpkg-linux.yml index cf72f6e49..15ae9ff04 100644 --- a/.github/workflows/vcpkg-linux.yml +++ b/.github/workflows/vcpkg-linux.yml @@ -567,6 +567,7 @@ jobs: # one will be in_progress and the second will be queued (waiting until the first finish), # and all others will be canceled. - name: Run vcpkg-linux-drivers.yml workflows + if: matrix.build-type.key == 'debug' && matrix.qt.key == 'qt6' working-directory: ${{ env.TinyORMPath }} run: | gh workflow run vcpkg-linux-drivers.yml --ref ${{ github.ref_name }} diff --git a/.github/workflows/vcpkg-windows-drivers.yml b/.github/workflows/vcpkg-windows-drivers.yml index 1b18a806c..2351ee245 100644 --- a/.github/workflows/vcpkg-windows-drivers.yml +++ b/.github/workflows/vcpkg-windows-drivers.yml @@ -475,6 +475,7 @@ jobs: # one will be in_progress and the second will be queued (waiting until the first finish), # and all others will be canceled. - name: Run msys2-ucrt64-drivers.yml workflows + if: matrix.build-type.key == 'debug' && matrix.qt.key == 'qt6' working-directory: ${{ env.TinyORMPath }} run: | gh workflow run msys2-ucrt64-drivers.yml --ref ${{ github.ref_name }} diff --git a/.github/workflows/vcpkg-windows.yml b/.github/workflows/vcpkg-windows.yml index ca0925a57..5e1a4b2e5 100644 --- a/.github/workflows/vcpkg-windows.yml +++ b/.github/workflows/vcpkg-windows.yml @@ -516,6 +516,7 @@ jobs: # one will be in_progress and the second will be queued (waiting until the first finish), # and all others will be canceled. - name: Run vcpkg-windows-drivers.yml workflows + if: matrix.build-type.key == 'debug' && matrix.qt.key == 'qt6' working-directory: ${{ env.TinyORMPath }} run: | gh workflow run vcpkg-windows-drivers.yml --ref ${{ github.ref_name }}