From e675ee1fc263b7a14fb05ce91e9b6fdc58a1c58b Mon Sep 17 00:00:00 2001 From: silverqx Date: Sun, 21 Apr 2024 18:41:44 +0200 Subject: [PATCH] workflows bugfix concurrency Workflows invoked one by one without queued workflows because GitHub cancels them. --- .github/workflows/linux-qt6-drivers.yml | 3 +-- .github/workflows/msvc2022-qt6-drivers.yml | 4 ++-- .github/workflows/vcpkg-linux.yml | 10 ++++++++++ .github/workflows/vcpkg-windows-drivers.yml | 10 ++++++++++ .github/workflows/vcpkg-windows.yml | 6 +----- 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/.github/workflows/linux-qt6-drivers.yml b/.github/workflows/linux-qt6-drivers.yml index c879ea8d0..ec923a776 100644 --- a/.github/workflows/linux-qt6-drivers.yml +++ b/.github/workflows/linux-qt6-drivers.yml @@ -247,10 +247,9 @@ jobs: # The reason for this is the concurrency:group: can contain only two in_progress workflows, # 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 + - name: Run vcpkg-linux.yml workflows working-directory: ${{ env.TinyORMPath }} run: | gh workflow run vcpkg-linux.yml --ref ${{ github.ref_name }} - gh workflow run vcpkg-linux-drivers.yml --ref ${{ github.ref_name }} env: GH_TOKEN: ${{ github.token }} diff --git a/.github/workflows/msvc2022-qt6-drivers.yml b/.github/workflows/msvc2022-qt6-drivers.yml index 11111b42c..4ad438c19 100644 --- a/.github/workflows/msvc2022-qt6-drivers.yml +++ b/.github/workflows/msvc2022-qt6-drivers.yml @@ -275,9 +275,9 @@ jobs: # The reason for this is the concurrency:group: can contain only two in_progress workflows, # 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 + - name: Run vcpkg-windows.yml workflows working-directory: ${{ env.TinyORMPath }} run: | - gh workflow run msys2-ucrt64-drivers.yml --ref ${{ github.ref_name }} + gh workflow run vcpkg-windows.yml --ref ${{ github.ref_name }} env: GH_TOKEN: ${{ github.token }} diff --git a/.github/workflows/vcpkg-linux.yml b/.github/workflows/vcpkg-linux.yml index f874861d4..cf72f6e49 100644 --- a/.github/workflows/vcpkg-linux.yml +++ b/.github/workflows/vcpkg-linux.yml @@ -562,3 +562,13 @@ jobs: ./HelloWorld env: TINYORM_HELLOWORLD_DB_SQLITE_DATABASE: ../../../HelloWorld.sqlite3 + + # The reason for this is the concurrency:group: can contain only two in_progress workflows, + # 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 + working-directory: ${{ env.TinyORMPath }} + run: | + gh workflow run vcpkg-linux-drivers.yml --ref ${{ github.ref_name }} + env: + GH_TOKEN: ${{ github.token }} diff --git a/.github/workflows/vcpkg-windows-drivers.yml b/.github/workflows/vcpkg-windows-drivers.yml index a10817fdb..1b18a806c 100644 --- a/.github/workflows/vcpkg-windows-drivers.yml +++ b/.github/workflows/vcpkg-windows-drivers.yml @@ -470,3 +470,13 @@ jobs: DB_MYSQL_SSL_KEY: ${{ secrets.DB_MYSQL_DATA_SELF_WINDOWS }}/client-key.pem DB_MYSQL_SSL_MODE: ${{ secrets.DB_MYSQL_SSL_MODE }} DB_MYSQL_USERNAME: ${{ secrets.DB_MYSQL_USERNAME_SELF }} + + # The reason for this is the concurrency:group: can contain only two in_progress workflows, + # 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 + working-directory: ${{ env.TinyORMPath }} + run: | + gh workflow run msys2-ucrt64-drivers.yml --ref ${{ github.ref_name }} + env: + GH_TOKEN: ${{ github.token }} diff --git a/.github/workflows/vcpkg-windows.yml b/.github/workflows/vcpkg-windows.yml index 0ed83caf6..ca0925a57 100644 --- a/.github/workflows/vcpkg-windows.yml +++ b/.github/workflows/vcpkg-windows.yml @@ -1,10 +1,6 @@ name: Vcpkg Windows -on: - workflow_dispatch: - push: - branches: - - main +on: workflow_dispatch concurrency: group: tinyorm-windows