From e9806fe09132b6c12c89d440dd752d0c60c7251d Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Tue, 3 Jun 2025 11:43:14 +0200 Subject: [PATCH 1/4] Fix CI concurrency --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e0289b28..5306f8b3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ on: pull_request: concurrency: - group: ci-main-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} env: From 1faee9c785f27f05ef72ac8b85416bcf2d9aa9f4 Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Tue, 3 Jun 2025 15:45:33 -0400 Subject: [PATCH 2/4] output --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5306f8b3..30f2b532 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,6 +40,8 @@ jobs: sudo systemctl start mysql.service echo "TEST_DB_USER=root" >> $GITHUB_ENV echo "TEST_DB_PASSWORD=root" >> $GITHUB_ENV + echo "${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}" + echo "${{ github.ref }}" - name: Setup postgresql if: contains(matrix.name, 'postgres') From 34eb390819e56021398d8d992b7f23e7fe123812 Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Tue, 3 Jun 2025 15:46:49 -0400 Subject: [PATCH 3/4] ugh so dumb --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 30f2b532..ad57b541 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,8 +40,6 @@ jobs: sudo systemctl start mysql.service echo "TEST_DB_USER=root" >> $GITHUB_ENV echo "TEST_DB_PASSWORD=root" >> $GITHUB_ENV - echo "${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}" - echo "${{ github.ref }}" - name: Setup postgresql if: contains(matrix.name, 'postgres') @@ -51,6 +49,8 @@ jobs: - name: Install dependencies run: | + echo "${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}" + echo "${{ github.ref }}" python -m pip install --upgrade pip pip install tox==4.26.0 From e61a800e03611e886f3e2b732f0ab83edbefe671 Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Tue, 3 Jun 2025 15:48:53 -0400 Subject: [PATCH 4/4] Update main.yml --- .github/workflows/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ad57b541..ace0cf53 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ on: pull_request: concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} env: @@ -49,8 +49,6 @@ jobs: - name: Install dependencies run: | - echo "${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}" - echo "${{ github.ref }}" python -m pip install --upgrade pip pip install tox==4.26.0