From f730e3532f3ecbd0035ee5c36f5aeada0ace5f39 Mon Sep 17 00:00:00 2001 From: Joe Wallwork Date: Thu, 2 Jan 2025 13:51:43 +0000 Subject: [PATCH 1/5] Enable tests for PRs that don't merge into main or develop --- .github/workflows/test_suite.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test_suite.yml b/.github/workflows/test_suite.yml index 48d32f433..c2cfe4d2c 100644 --- a/.github/workflows/test_suite.yml +++ b/.github/workflows/test_suite.yml @@ -4,7 +4,6 @@ on: push: branches: [ main, develop ] pull_request: - branches: [ main, develop ] paths: - '.github/workflows/test_suite.yml' - '**.cdl' From af5663904a9ef87341f40b27e67550c1a3d864db Mon Sep 17 00:00:00 2001 From: tommelt Date: Tue, 7 Jan 2025 11:18:31 +0000 Subject: [PATCH 2/5] test should now run CI --- .github/workflows/test_suite.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/test_suite.yml b/.github/workflows/test_suite.yml index c2cfe4d2c..a2cdc3d31 100644 --- a/.github/workflows/test_suite.yml +++ b/.github/workflows/test_suite.yml @@ -1,6 +1,13 @@ name: compile code and tests on: + # if you wish to skip running CI please don't change this section, instead + # prefix the following notation in the title of your commit message e.g., + # + # [skip ci] my commit message + # + # For more information, please read the GitHub + # [documentation](https://docs.github.com/en/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/skipping-workflow-runs) push: branches: [ main, develop ] pull_request: From 6399d80d959b88d8c754710603c78f75bd84a860 Mon Sep 17 00:00:00 2001 From: tommelt Date: Tue, 7 Jan 2025 11:26:27 +0000 Subject: [PATCH 3/5] [skip ci] chore: add comment to github workflow about skipping CI See comments in `.github/workflows/test_suite.yml` for more info. --- .github/workflows/test_suite.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test_suite.yml b/.github/workflows/test_suite.yml index a2cdc3d31..35d9d1a98 100644 --- a/.github/workflows/test_suite.yml +++ b/.github/workflows/test_suite.yml @@ -8,6 +8,10 @@ on: # # For more information, please read the GitHub # [documentation](https://docs.github.com/en/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/skipping-workflow-runs) + # + # Note: You will not be able to merge into develop or main without running CI. To run CI either: + # - edit the last commit message using `git commit --amend` and remove the tag "[skip ci]" or, + # - create a new commit without a "[skip ci]" tag push: branches: [ main, develop ] pull_request: From b3522a36d08a50258fb267ff4bc1bd5b799d5c0e Mon Sep 17 00:00:00 2001 From: Joe Wallwork Date: Mon, 14 Apr 2025 15:19:02 +0100 Subject: [PATCH 4/5] Run test suite and linting workflows upon receiving a PR review --- .github/workflows/linting.yml | 1 + .github/workflows/test_suite.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 913d464d2..a5269f5cb 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -10,6 +10,7 @@ on: - '**.cpp' - '**.hpp' - '**CMakeLists.txt' + pull_request_review: jobs: clang-format: diff --git a/.github/workflows/test_suite.yml b/.github/workflows/test_suite.yml index 35d9d1a98..ea0def793 100644 --- a/.github/workflows/test_suite.yml +++ b/.github/workflows/test_suite.yml @@ -25,6 +25,7 @@ on: - '**.sh' - '**.xml' - '**CMakeLists.txt' + pull_request_review: jobs: From 587e2d81e41c83da65e898b334ed75e5394467f4 Mon Sep 17 00:00:00 2001 From: Joe Wallwork Date: Mon, 14 Apr 2025 15:59:41 +0100 Subject: [PATCH 5/5] Restrict review triggers to main and develop --- .github/workflows/linting.yml | 1 + .github/workflows/test_suite.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index a5269f5cb..cdcdd319f 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -11,6 +11,7 @@ on: - '**.hpp' - '**CMakeLists.txt' pull_request_review: + branches: [ main, develop ] jobs: clang-format: diff --git a/.github/workflows/test_suite.yml b/.github/workflows/test_suite.yml index ea0def793..4d7651cd8 100644 --- a/.github/workflows/test_suite.yml +++ b/.github/workflows/test_suite.yml @@ -26,6 +26,7 @@ on: - '**.xml' - '**CMakeLists.txt' pull_request_review: + branches: [ main, develop ] jobs: