From 36aa80c9a5221aca284a54af6928690dd3d10f94 Mon Sep 17 00:00:00 2001 From: Martijn Govers Date: Wed, 24 Apr 2024 14:49:53 +0200 Subject: [PATCH 1/3] run citations workflow when current workflow changes + add concurrency Signed-off-by: Martijn Govers --- .github/workflows/build-test-and-sonar.yml | 4 ++++ .github/workflows/check-blocking-labels.yml | 4 ++++ .github/workflows/check-code-quality.yml | 4 ++++ .github/workflows/citations.yml | 7 +++++++ .github/workflows/reuse-compliance.yml | 4 ++++ 5 files changed, 23 insertions(+) diff --git a/.github/workflows/build-test-and-sonar.yml b/.github/workflows/build-test-and-sonar.yml index a1ee447b..25c81a91 100644 --- a/.github/workflows/build-test-and-sonar.yml +++ b/.github/workflows/build-test-and-sonar.yml @@ -22,6 +22,10 @@ on: default: true required: true +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: build-python: diff --git a/.github/workflows/check-blocking-labels.yml b/.github/workflows/check-blocking-labels.yml index 10fe7fe3..b571c092 100644 --- a/.github/workflows/check-blocking-labels.yml +++ b/.github/workflows/check-blocking-labels.yml @@ -18,6 +18,10 @@ on: # run this workflow manually from the Actions tab workflow_dispatch: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: check-blocking-labels: runs-on: ubuntu-latest diff --git a/.github/workflows/check-code-quality.yml b/.github/workflows/check-code-quality.yml index f42ddc97..c0f3c04e 100644 --- a/.github/workflows/check-code-quality.yml +++ b/.github/workflows/check-code-quality.yml @@ -14,6 +14,10 @@ on: # run pipeline on merge queue merge_group: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: check-code-quality: runs-on: ubuntu-latest diff --git a/.github/workflows/citations.yml b/.github/workflows/citations.yml index c78e3308..85489933 100644 --- a/.github/workflows/citations.yml +++ b/.github/workflows/citations.yml @@ -9,11 +9,18 @@ on: push: branches: - main + + pull_request: paths: - CITATION.cff + - .github/workflows/citations.yml workflow_dispatch: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: validate-citations: runs-on: ubuntu-latest diff --git a/.github/workflows/reuse-compliance.yml b/.github/workflows/reuse-compliance.yml index 57520d2e..c112330f 100644 --- a/.github/workflows/reuse-compliance.yml +++ b/.github/workflows/reuse-compliance.yml @@ -14,6 +14,10 @@ on: # run pipeline on merge queue merge_group: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: reuse-compliance-check: runs-on: ubuntu-latest From 30eeaba94da8f7c757601136e9c2f63681cc0acc Mon Sep 17 00:00:00 2001 From: Martijn Govers Date: Wed, 24 Apr 2024 15:34:32 +0200 Subject: [PATCH 2/3] exclude matrix run macos python-3.9 Signed-off-by: Martijn Govers --- .github/workflows/build-test-and-sonar.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build-test-and-sonar.yml b/.github/workflows/build-test-and-sonar.yml index 25c81a91..bb51ee24 100644 --- a/.github/workflows/build-test-and-sonar.yml +++ b/.github/workflows/build-test-and-sonar.yml @@ -98,6 +98,9 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] python: ["3.9", "3.10", "3.11", "3.12"] + exclude: + - os: macos-latest + python: "3.9" fail-fast: false runs-on: ${{ matrix.os }} @@ -129,6 +132,9 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] python: ["3.9", "3.10", "3.11", "3.12"] + exclude: + - os: macos-latest + python: "3.9" fail-fast: false runs-on: ${{ matrix.os }} From 76ee77d94ba299215a83e2edccbb0f73fd359dd5 Mon Sep 17 00:00:00 2001 From: Martijn Govers Date: Wed, 24 Apr 2024 15:43:03 +0200 Subject: [PATCH 3/3] minor Signed-off-by: Martijn Govers --- .github/workflows/citations.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/citations.yml b/.github/workflows/citations.yml index 85489933..269d7d94 100644 --- a/.github/workflows/citations.yml +++ b/.github/workflows/citations.yml @@ -9,6 +9,9 @@ on: push: branches: - main + paths: + - CITATION.cff + - .github/workflows/citations.yml pull_request: paths: