From df1899834c16cfd5f497470405c29d6a60b78854 Mon Sep 17 00:00:00 2001 From: Kyle Shores Date: Wed, 29 May 2024 10:46:02 -0500 Subject: [PATCH 1/2] actions run on workflow dispatch or pr --- .github/workflows/clang-tidy.yml | 2 +- .github/workflows/clang_format_non_inline.yml | 2 +- .github/workflows/docker_and_coverage.yml | 2 +- .github/workflows/gh_pages.yml | 2 +- .github/workflows/mac.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- .github/workflows/windows.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index 924ced78c..d5f477eb0 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -1,6 +1,6 @@ name: Clang-Tidy -on: [push, pull_request] +on: [pull_request, workflow_dispatch] concurrency: group: ${{ github.workflow }}-${{ github.ref || github.run_id }} diff --git a/.github/workflows/clang_format_non_inline.yml b/.github/workflows/clang_format_non_inline.yml index 77a93e519..e97b547cd 100644 --- a/.github/workflows/clang_format_non_inline.yml +++ b/.github/workflows/clang_format_non_inline.yml @@ -1,6 +1,6 @@ name: Clang-Format -on: [push, pull_request] +on: [pull_request, workflow_dispatch] concurrency: group: ${{ github.workflow }}-${{ github.ref || github.run_id }} diff --git a/.github/workflows/docker_and_coverage.yml b/.github/workflows/docker_and_coverage.yml index 2566c3c4f..db2432420 100644 --- a/.github/workflows/docker_and_coverage.yml +++ b/.github/workflows/docker_and_coverage.yml @@ -1,6 +1,6 @@ name: Docker -on: [push, pull_request] +on: [pull_request, workflow_dispatch] concurrency: group: ${{ github.workflow }}-${{ github.ref || github.run_id }} diff --git a/.github/workflows/gh_pages.yml b/.github/workflows/gh_pages.yml index 0f8651efb..cccff19ba 100644 --- a/.github/workflows/gh_pages.yml +++ b/.github/workflows/gh_pages.yml @@ -1,7 +1,7 @@ # Build and deploy documentation to GitHub Pages name: GitHub Pages -on: [ push, pull_request ] +on: [pull_request, workflow_dispatch] env: DEFAULT_BRANCH: "release" diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 0510cbd84..66ec60ef4 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -1,6 +1,6 @@ name: Mac -on: [push, pull_request] +on: [pull_request, workflow_dispatch] concurrency: group: ${{ github.workflow }}-${{ github.ref || github.run_id }} diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 24ecf6025..f55f37ad3 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -1,6 +1,6 @@ name: Ubuntu -on: [push, pull_request] +on: [pull_request, workflow_dispatch] concurrency: group: ${{ github.workflow }}-${{ github.ref || github.run_id }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 460482584..626678b86 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -1,6 +1,6 @@ name: Windows -on: [push, pull_request] +on: [pull_request, workflow_dispatch] concurrency: group: ${{ github.workflow }}-${{ github.ref || github.run_id }} From 784d31e54b51e1552a8c3f0bb833d1ae99d4b389 Mon Sep 17 00:00:00 2001 From: Kyle Shores Date: Wed, 29 May 2024 10:47:47 -0500 Subject: [PATCH 2/2] removing now unnecessary if check --- .github/workflows/docker_and_coverage.yml | 1 - .github/workflows/gh_pages.yml | 2 +- .github/workflows/mac.yml | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/docker_and_coverage.yml b/.github/workflows/docker_and_coverage.yml index db2432420..4c82a5972 100644 --- a/.github/workflows/docker_and_coverage.yml +++ b/.github/workflows/docker_and_coverage.yml @@ -8,7 +8,6 @@ concurrency: jobs: docker-build-and-test: - if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name name: Build and Test - ${{ matrix.dockerfile }} runs-on: ubuntu-latest strategy: diff --git a/.github/workflows/gh_pages.yml b/.github/workflows/gh_pages.yml index cccff19ba..6ba4dbb78 100644 --- a/.github/workflows/gh_pages.yml +++ b/.github/workflows/gh_pages.yml @@ -1,7 +1,7 @@ # Build and deploy documentation to GitHub Pages name: GitHub Pages -on: [pull_request, workflow_dispatch] +on: [pull_request, push] env: DEFAULT_BRANCH: "release" diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 66ec60ef4..e80d4dc37 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -8,7 +8,6 @@ concurrency: jobs: xcode_macos_12: - if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name runs-on: macos-12 strategy: matrix: @@ -33,7 +32,6 @@ jobs: ctest -C ${{ matrix.build_type }} --rerun-failed --output-on-failure . --verbose -j 10 xcode_macos_13: - if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name runs-on: macos-13 strategy: matrix: @@ -58,7 +56,6 @@ jobs: ctest -C ${{ matrix.build_type }} --rerun-failed --output-on-failure . --verbose -j 10 macos_lateset: - if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name runs-on: macos-latest strategy: matrix: