From 65888cc4ba3ef2a10da066aadf0db6a6a1eee59a Mon Sep 17 00:00:00 2001 From: rem1776 Date: Mon, 20 Nov 2023 11:54:29 -0500 Subject: [PATCH 1/4] turn on canceling runs if newer commit available --- .github/workflows/github_autotools_gnu.yml | 5 +++++ .github/workflows/github_autotools_intel.yml | 6 ++++++ .github/workflows/github_cmake_gnu.yml | 5 +++++ .github/workflows/github_coupler_gnu.yml | 5 +++++ 4 files changed, 21 insertions(+) diff --git a/.github/workflows/github_autotools_gnu.yml b/.github/workflows/github_autotools_gnu.yml index 00c7f5d31c..55eb2088a5 100644 --- a/.github/workflows/github_autotools_gnu.yml +++ b/.github/workflows/github_autotools_gnu.yml @@ -4,6 +4,11 @@ name: Build libFMS test with autotools on: [push, pull_request] +# cancel running jobs if theres a newer push +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/github_autotools_intel.yml b/.github/workflows/github_autotools_intel.yml index 851ad71520..a5e69fe9e9 100644 --- a/.github/workflows/github_autotools_intel.yml +++ b/.github/workflows/github_autotools_intel.yml @@ -1,4 +1,10 @@ on: pull_request + +# cancel running jobs if theres a newer push +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: intel-autotools: runs-on: ubuntu-latest diff --git a/.github/workflows/github_cmake_gnu.yml b/.github/workflows/github_cmake_gnu.yml index d4f7e2a248..ae4eaafb91 100644 --- a/.github/workflows/github_cmake_gnu.yml +++ b/.github/workflows/github_cmake_gnu.yml @@ -2,6 +2,11 @@ name: Build libFMS with cmake on: [push, pull_request] +# cancel running jobs if theres a newer push +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/github_coupler_gnu.yml b/.github/workflows/github_coupler_gnu.yml index 4e3e357d0d..2f2f8cadb7 100644 --- a/.github/workflows/github_coupler_gnu.yml +++ b/.github/workflows/github_coupler_gnu.yml @@ -1,6 +1,11 @@ name: Test coupler build on: [pull_request] +# cancel running jobs if theres a newer push +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: coupler-build: runs-on: ubuntu-latest From b4e49015c4b6c9e76f63b0b264ae9a8b924863d7 Mon Sep 17 00:00:00 2001 From: rem1776 Date: Mon, 20 Nov 2023 12:34:10 -0500 Subject: [PATCH 2/4] update deprecated checkout versions --- .github/workflows/github_autotools_gnu.yml | 2 +- .github/workflows/github_autotools_intel.yml | 2 +- .github/workflows/github_cmake_gnu.yml | 2 +- .github/workflows/github_coupler_gnu.yml | 4 ++-- .github/workflows/github_doc_site.yml | 2 +- .github/workflows/github_linter.yml | 2 +- .github/workflows/version.yml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/github_autotools_gnu.yml b/.github/workflows/github_autotools_gnu.yml index 55eb2088a5..8df7021bb9 100644 --- a/.github/workflows/github_autotools_gnu.yml +++ b/.github/workflows/github_autotools_gnu.yml @@ -27,7 +27,7 @@ jobs: SKIP_TESTS: "test_yaml_parser.5" # temporary till fixes are in steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Prepare GNU autoconf for build run: autoreconf -if - name: Configure the build diff --git a/.github/workflows/github_autotools_intel.yml b/.github/workflows/github_autotools_intel.yml index a5e69fe9e9..a09f8c87d3 100644 --- a/.github/workflows/github_autotools_intel.yml +++ b/.github/workflows/github_autotools_intel.yml @@ -53,7 +53,7 @@ jobs: ./configure --prefix=/libs make -j install && cd - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Configure run: autoreconf -if ./configure.ac && ./configure --with-yaml - name: Compile diff --git a/.github/workflows/github_cmake_gnu.yml b/.github/workflows/github_cmake_gnu.yml index ae4eaafb91..08fed288cc 100644 --- a/.github/workflows/github_cmake_gnu.yml +++ b/.github/workflows/github_cmake_gnu.yml @@ -21,7 +21,7 @@ jobs: CMAKE_FLAGS: "${{ matrix.omp-flags }} ${{ matrix.io-flag }} ${{ matrix.libyaml-flag }} -D64BIT=on" steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Generate makefiles with CMake run: cmake $CMAKE_FLAGS . - name: Build the library diff --git a/.github/workflows/github_coupler_gnu.yml b/.github/workflows/github_coupler_gnu.yml index 2f2f8cadb7..70cf0db3a5 100644 --- a/.github/workflows/github_coupler_gnu.yml +++ b/.github/workflows/github_coupler_gnu.yml @@ -22,11 +22,11 @@ jobs: LDFLAGS: '-L/opt/view/lib' steps: - name: Checkout FMS - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: FMS - name: Checkout FMScoupler - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: 'NOAA-GFDL/FMScoupler' path: FMScoupler diff --git a/.github/workflows/github_doc_site.yml b/.github/workflows/github_doc_site.yml index bbf2335811..43c4d89897 100644 --- a/.github/workflows/github_doc_site.yml +++ b/.github/workflows/github_doc_site.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup repo run: | # do autotool's job for substitutes since we don't need a full build environement mkdir gen_docs diff --git a/.github/workflows/github_linter.yml b/.github/workflows/github_linter.yml index c24de95783..9c0d00e67e 100644 --- a/.github/workflows/github_linter.yml +++ b/.github/workflows/github_linter.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Run Lint uses: NOAA-GFDL/simple_lint@f5aa1fe976bd4c231db0536ba00cbfdc26708253 with: diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index 31641aea69..d910b6c8f8 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -7,7 +7,7 @@ jobs: add-dev-to-version: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Append version with dev run: sed -i '/20[0-9][0-9]\.[0-9][0-9]/ s/]/-dev]/' configure.ac - name: Create pull request From 8aacf1af7464ba4994757548bad5802e8a787f4b Mon Sep 17 00:00:00 2001 From: rem1776 Date: Mon, 20 Nov 2023 13:29:54 -0500 Subject: [PATCH 3/4] Empty-Commit From adde845a2f1b6a23b1fcef85c9982ad5198953d8 Mon Sep 17 00:00:00 2001 From: rem1776 Date: Mon, 20 Nov 2023 13:32:08 -0500 Subject: [PATCH 4/4] Empty-Commit2