From e7844708790ebe849631a83bd904d859ff74451d Mon Sep 17 00:00:00 2001 From: "David J. Gardner" Date: Sun, 5 Nov 2023 11:27:34 -0800 Subject: [PATCH 1/4] cancel existing workflow on new push --- .github/workflows/double-precision.yml | 4 ++++ .github/workflows/extended-precision.yml | 4 ++++ .github/workflows/macos-latest.yml | 4 ++++ .github/workflows/single-precision.yml | 4 ++++ .github/workflows/spack-develop.yml | 4 ++++ .github/workflows/ubuntu-clang-latest.yml | 4 ++++ .github/workflows/windows-latest-mingw.yml | 4 ++++ .github/workflows/windows-latest.yml | 4 ++++ 8 files changed, 32 insertions(+) diff --git a/.github/workflows/double-precision.yml b/.github/workflows/double-precision.yml index 9303af7523..c682b47d6b 100644 --- a/.github/workflows/double-precision.yml +++ b/.github/workflows/double-precision.yml @@ -5,6 +5,10 @@ on: push: pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: build_and_test: runs-on: ubuntu-latest diff --git a/.github/workflows/extended-precision.yml b/.github/workflows/extended-precision.yml index dc6f32e726..a979d56ee0 100644 --- a/.github/workflows/extended-precision.yml +++ b/.github/workflows/extended-precision.yml @@ -4,6 +4,10 @@ name: extended precision build and test with GCC+TPLs (no GPUs) on: pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: build_and_test: runs-on: ubuntu-latest diff --git a/.github/workflows/macos-latest.yml b/.github/workflows/macos-latest.yml index 9efb20d976..6d7f4348f0 100644 --- a/.github/workflows/macos-latest.yml +++ b/.github/workflows/macos-latest.yml @@ -3,6 +3,10 @@ name: MacOS short test on: pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: Release diff --git a/.github/workflows/single-precision.yml b/.github/workflows/single-precision.yml index 304ae4e3bc..94ca216a5c 100644 --- a/.github/workflows/single-precision.yml +++ b/.github/workflows/single-precision.yml @@ -4,6 +4,10 @@ name: single precision build and test with GCC+TPLs (no GPUs) on: pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: build_and_test: runs-on: ubuntu-latest diff --git a/.github/workflows/spack-develop.yml b/.github/workflows/spack-develop.yml index 07dce581c2..b6f5fef591 100644 --- a/.github/workflows/spack-develop.yml +++ b/.github/workflows/spack-develop.yml @@ -7,6 +7,10 @@ on: schedule: - cron: '00 22 * * *' +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: build_and_test: runs-on: ubuntu-latest diff --git a/.github/workflows/ubuntu-clang-latest.yml b/.github/workflows/ubuntu-clang-latest.yml index 29da08a417..9ffa9d6b59 100644 --- a/.github/workflows/ubuntu-clang-latest.yml +++ b/.github/workflows/ubuntu-clang-latest.yml @@ -3,6 +3,10 @@ name: Ubuntu (clang) short test on: pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: Release diff --git a/.github/workflows/windows-latest-mingw.yml b/.github/workflows/windows-latest-mingw.yml index ab20ea721a..6aec0b789b 100644 --- a/.github/workflows/windows-latest-mingw.yml +++ b/.github/workflows/windows-latest-mingw.yml @@ -3,6 +3,10 @@ name: Windows (mingw) short test on: pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: Release diff --git a/.github/workflows/windows-latest.yml b/.github/workflows/windows-latest.yml index d640eb6bd2..8bc3bd3bcc 100644 --- a/.github/workflows/windows-latest.yml +++ b/.github/workflows/windows-latest.yml @@ -3,6 +3,10 @@ name: Windows short test on: pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: Release From 217895d15797e2ccd1113d7f86b434257fa27f81 Mon Sep 17 00:00:00 2001 From: "David J. Gardner" Date: Sun, 5 Nov 2023 11:28:27 -0800 Subject: [PATCH 2/4] add dispatch trigger for actions --- .github/workflows/double-precision.yml | 1 + .github/workflows/extended-precision.yml | 1 + .github/workflows/macos-latest.yml | 1 + .github/workflows/single-precision.yml | 1 + .github/workflows/ubuntu-clang-latest.yml | 1 + .github/workflows/windows-latest-mingw.yml | 1 + .github/workflows/windows-latest.yml | 1 + 7 files changed, 7 insertions(+) diff --git a/.github/workflows/double-precision.yml b/.github/workflows/double-precision.yml index c682b47d6b..675cd112db 100644 --- a/.github/workflows/double-precision.yml +++ b/.github/workflows/double-precision.yml @@ -4,6 +4,7 @@ name: double precision build and test with GCC+TPLs (no GPUs) on: push: pull_request: + workflow_dispatch: concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/extended-precision.yml b/.github/workflows/extended-precision.yml index a979d56ee0..ed012edc37 100644 --- a/.github/workflows/extended-precision.yml +++ b/.github/workflows/extended-precision.yml @@ -3,6 +3,7 @@ name: extended precision build and test with GCC+TPLs (no GPUs) on: pull_request: + workflow_dispatch: concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/macos-latest.yml b/.github/workflows/macos-latest.yml index 6d7f4348f0..f9d7b95635 100644 --- a/.github/workflows/macos-latest.yml +++ b/.github/workflows/macos-latest.yml @@ -2,6 +2,7 @@ name: MacOS short test on: pull_request: + workflow_dispatch: concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/single-precision.yml b/.github/workflows/single-precision.yml index 94ca216a5c..a8ce05cd3b 100644 --- a/.github/workflows/single-precision.yml +++ b/.github/workflows/single-precision.yml @@ -3,6 +3,7 @@ name: single precision build and test with GCC+TPLs (no GPUs) on: pull_request: + workflow_dispatch: concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/ubuntu-clang-latest.yml b/.github/workflows/ubuntu-clang-latest.yml index 9ffa9d6b59..1004888800 100644 --- a/.github/workflows/ubuntu-clang-latest.yml +++ b/.github/workflows/ubuntu-clang-latest.yml @@ -2,6 +2,7 @@ name: Ubuntu (clang) short test on: pull_request: + workflow_dispatch: concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/windows-latest-mingw.yml b/.github/workflows/windows-latest-mingw.yml index 6aec0b789b..d6801c85ac 100644 --- a/.github/workflows/windows-latest-mingw.yml +++ b/.github/workflows/windows-latest-mingw.yml @@ -2,6 +2,7 @@ name: Windows (mingw) short test on: pull_request: + workflow_dispatch: concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/windows-latest.yml b/.github/workflows/windows-latest.yml index 8bc3bd3bcc..bc14214813 100644 --- a/.github/workflows/windows-latest.yml +++ b/.github/workflows/windows-latest.yml @@ -2,6 +2,7 @@ name: Windows short test on: pull_request: + workflow_dispatch: concurrency: group: ${{ github.workflow }}-${{ github.ref }} From be24fbb98ebe846a19db2680fbc40fd68e0ceb1e Mon Sep 17 00:00:00 2001 From: "David J. Gardner" Date: Sun, 5 Nov 2023 11:28:52 -0800 Subject: [PATCH 3/4] upload all outputs in testing directory --- .github/workflows/double-precision.yml | 6 +++--- .github/workflows/extended-precision.yml | 6 +++--- .github/workflows/single-precision.yml | 6 +++--- .github/workflows/spack-develop.yml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/double-precision.yml b/.github/workflows/double-precision.yml index 675cd112db..83ff21a31a 100644 --- a/.github/workflows/double-precision.yml +++ b/.github/workflows/double-precision.yml @@ -31,7 +31,7 @@ jobs: indexsize: ${{ matrix.indexsize }} precision: ${{ matrix.precision }} - name: Archive build files from failed build - uses: actions/upload-artifact@v2.2.4 + uses: actions/upload-artifact@v3 if: failure() with: name: build_files @@ -39,9 +39,9 @@ jobs: ${{ github.workspace }}/test/build_* !${{ github.workspace }}/test/build_*/Testing/output - name: Archive output files from failed build - uses: actions/upload-artifact@v2.2.4 + uses: actions/upload-artifact@v3 if: failure() with: name: output_files path: | - ${{ github.workspace }}/test/build_*/Testing/output + ${{ github.workspace }}/test/build_*/Testing/ diff --git a/.github/workflows/extended-precision.yml b/.github/workflows/extended-precision.yml index ed012edc37..3d3750fecc 100644 --- a/.github/workflows/extended-precision.yml +++ b/.github/workflows/extended-precision.yml @@ -30,7 +30,7 @@ jobs: indexsize: ${{ matrix.indexsize }} precision: ${{ matrix.precision }} - name: Archive build files from failed build - uses: actions/upload-artifact@v2.2.4 + uses: actions/upload-artifact@v3 if: failure() with: name: build_files @@ -38,9 +38,9 @@ jobs: ${{ github.workspace }}/test/build_* !${{ github.workspace }}/test/build_*/Testing/output - name: Archive output files from failed build - uses: actions/upload-artifact@v2.2.4 + uses: actions/upload-artifact@v3 if: failure() with: name: output_files path: | - ${{ github.workspace }}/test/build_*/Testing/output + ${{ github.workspace }}/test/build_*/Testing/ diff --git a/.github/workflows/single-precision.yml b/.github/workflows/single-precision.yml index a8ce05cd3b..4fe166916b 100644 --- a/.github/workflows/single-precision.yml +++ b/.github/workflows/single-precision.yml @@ -30,7 +30,7 @@ jobs: indexsize: ${{ matrix.indexsize }} precision: ${{ matrix.precision }} - name: Archive build files from failed build - uses: actions/upload-artifact@v2.2.4 + uses: actions/upload-artifact@v3 if: failure() with: name: build_files @@ -38,9 +38,9 @@ jobs: ${{ github.workspace }}/test/build_* !${{ github.workspace }}/test/build_*/Testing/output - name: Archive output files from failed build - uses: actions/upload-artifact@v2.2.4 + uses: actions/upload-artifact@v3 if: failure() with: name: output_files path: | - ${{ github.workspace }}/test/build_*/Testing/output + ${{ github.workspace }}/test/build_*/Testing/ diff --git a/.github/workflows/spack-develop.yml b/.github/workflows/spack-develop.yml index b6f5fef591..73bb3f73d8 100644 --- a/.github/workflows/spack-develop.yml +++ b/.github/workflows/spack-develop.yml @@ -32,7 +32,7 @@ jobs: indexsize: ${{ matrix.indexsize }} precision: ${{ matrix.precision }} - name: Archive build files from failed build - uses: actions/upload-artifact@v2.2.4 + uses: actions/upload-artifact@v3 if: failure() with: name: build_files @@ -40,9 +40,9 @@ jobs: ${{ github.workspace }}/test/build_* !${{ github.workspace }}/test/build_*/Testing/output - name: Archive output files from failed build - uses: actions/upload-artifact@v2.2.4 + uses: actions/upload-artifact@v3 if: failure() with: name: output_files path: | - ${{ github.workspace }}/test/build_*/Testing/output + ${{ github.workspace }}/test/build_*/Testing/ From 9cb3428e5af0b0ca7e6ae19ae2e0c9b4367f5a2d Mon Sep 17 00:00:00 2001 From: Cody Balos Date: Sun, 5 Nov 2023 23:00:58 -0800 Subject: [PATCH 4/4] add merge_group dispatch --- .github/workflows/double-precision.yml | 1 + .github/workflows/extended-precision.yml | 1 + .github/workflows/macos-latest.yml | 1 + .github/workflows/single-precision.yml | 1 + .github/workflows/spack-develop.yml | 1 + .github/workflows/ubuntu-clang-latest.yml | 1 + .github/workflows/windows-latest-mingw.yml | 1 + .github/workflows/windows-latest.yml | 1 + 8 files changed, 8 insertions(+) diff --git a/.github/workflows/double-precision.yml b/.github/workflows/double-precision.yml index 83ff21a31a..31feaf3ffb 100644 --- a/.github/workflows/double-precision.yml +++ b/.github/workflows/double-precision.yml @@ -4,6 +4,7 @@ name: double precision build and test with GCC+TPLs (no GPUs) on: push: pull_request: + merge_group: workflow_dispatch: concurrency: diff --git a/.github/workflows/extended-precision.yml b/.github/workflows/extended-precision.yml index 3d3750fecc..55d75f7d5d 100644 --- a/.github/workflows/extended-precision.yml +++ b/.github/workflows/extended-precision.yml @@ -3,6 +3,7 @@ name: extended precision build and test with GCC+TPLs (no GPUs) on: pull_request: + merge_group: workflow_dispatch: concurrency: diff --git a/.github/workflows/macos-latest.yml b/.github/workflows/macos-latest.yml index f9d7b95635..4d5599295e 100644 --- a/.github/workflows/macos-latest.yml +++ b/.github/workflows/macos-latest.yml @@ -2,6 +2,7 @@ name: MacOS short test on: pull_request: + merge_group: workflow_dispatch: concurrency: diff --git a/.github/workflows/single-precision.yml b/.github/workflows/single-precision.yml index 4fe166916b..9a87e7f0bd 100644 --- a/.github/workflows/single-precision.yml +++ b/.github/workflows/single-precision.yml @@ -3,6 +3,7 @@ name: single precision build and test with GCC+TPLs (no GPUs) on: pull_request: + merge_group: workflow_dispatch: concurrency: diff --git a/.github/workflows/spack-develop.yml b/.github/workflows/spack-develop.yml index 73bb3f73d8..745a57df7e 100644 --- a/.github/workflows/spack-develop.yml +++ b/.github/workflows/spack-develop.yml @@ -3,6 +3,7 @@ name: spack@develop build and test with GCC+TPLs (no GPUs) on: pull_request: + merge_group: workflow_dispatch: schedule: - cron: '00 22 * * *' diff --git a/.github/workflows/ubuntu-clang-latest.yml b/.github/workflows/ubuntu-clang-latest.yml index 1004888800..71f398d30a 100644 --- a/.github/workflows/ubuntu-clang-latest.yml +++ b/.github/workflows/ubuntu-clang-latest.yml @@ -2,6 +2,7 @@ name: Ubuntu (clang) short test on: pull_request: + merge_group: workflow_dispatch: concurrency: diff --git a/.github/workflows/windows-latest-mingw.yml b/.github/workflows/windows-latest-mingw.yml index d6801c85ac..5289a953da 100644 --- a/.github/workflows/windows-latest-mingw.yml +++ b/.github/workflows/windows-latest-mingw.yml @@ -2,6 +2,7 @@ name: Windows (mingw) short test on: pull_request: + merge_group: workflow_dispatch: concurrency: diff --git a/.github/workflows/windows-latest.yml b/.github/workflows/windows-latest.yml index bc14214813..66489fe976 100644 --- a/.github/workflows/windows-latest.yml +++ b/.github/workflows/windows-latest.yml @@ -2,6 +2,7 @@ name: Windows short test on: pull_request: + merge_group: workflow_dispatch: concurrency: