From 2f0478c5c48b9f51cff1485815add0de509ee38d Mon Sep 17 00:00:00 2001 From: Soren Rasmussen Date: Wed, 22 May 2024 17:45:25 -0600 Subject: [PATCH 1/3] Updating Github action versions that the CI is warning will be deprecated. Checkout to v4, setup-python to v5, cache to v4, upload-artifact to v4, setup-miniconda to v3. --- .github/workflows/ci_build_scm_ubuntu_22.04.yml | 12 ++++++------ .../workflows/ci_build_scm_ubuntu_22.04_nvidia.yml | 14 +++++++------- .github/workflows/ci_run_scm_DEPHY.yml | 12 ++++++------ .github/workflows/ci_run_scm_rts.yml | 14 +++++++------- .github/workflows/ci_run_scm_ufs_replay.yml | 10 +++++----- .github/workflows/ci_scm_ccpp_prebuild.yml | 6 +++--- 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04.yml b/.github/workflows/ci_build_scm_ubuntu_22.04.yml index 6c33a30e5..cd709a3a3 100644 --- a/.github/workflows/ci_build_scm_ubuntu_22.04.yml +++ b/.github/workflows/ci_build_scm_ubuntu_22.04.yml @@ -30,7 +30,7 @@ jobs: # Initial ####################################################################################### - name: Checkout SCM code (into /home/runner/work/ccpp-scm/) - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Initialize submodules run: git submodule update --init --recursive @@ -39,7 +39,7 @@ jobs: # Python setup ####################################################################################### - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{matrix.py-version}} @@ -87,7 +87,7 @@ jobs: - name: Cache bacio library v2.4.1 id: cache-bacio-fortran - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/bacio key: cache-bacio-fortran-${{matrix.fortran-compiler}}-key @@ -104,7 +104,7 @@ jobs: - name: Cache SP-library v2.3.3 id: cache-sp-fortran - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/NCEPLIBS-sp key: cache-sp-fortran-${{matrix.fortran-compiler}}-key @@ -121,7 +121,7 @@ jobs: - name: Cache w3emc library v2.9.2 id: cache-w3emc-fortran - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/myw3emc key: cache-w3emc-fortran-${{matrix.fortran-compiler}}-key @@ -143,7 +143,7 @@ jobs: - name: Cache NetCDF Fortran library id: cache-netcdf-fortran - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/netcdf-fortran key: cache-netcdf-fortran-${{matrix.fortran-compiler}}-key diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml b/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml index 8bb7fcedb..cef900f9b 100644 --- a/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml +++ b/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml @@ -60,7 +60,7 @@ jobs: # Initial ####################################################################################### - name: Checkout SCM code (into /home/runner/work/ccpp-scm/) - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Initialize submodules run: git submodule update --init --recursive @@ -69,7 +69,7 @@ jobs: # Python setup ####################################################################################### - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{matrix.py-version}} @@ -151,7 +151,7 @@ jobs: - name: Cache NetCDF C library id: cache-netcdf-c - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/netcdf-c key: cache-netcdf-c-${{matrix.fortran-compiler}}-key @@ -170,7 +170,7 @@ jobs: - name: Cache NetCDF Fortran library id: cache-netcdf-fortran - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/netcdf-fortran key: cache-netcdf-fortran-${{matrix.fortran-compiler}}-key @@ -187,7 +187,7 @@ jobs: - name: Cache bacio library v2.4.1 id: cache-bacio-fortran - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/bacio key: cache-bacio-fortran-${{matrix.fortran-compiler}}-key @@ -204,7 +204,7 @@ jobs: - name: Cache SP-library v2.3.3 id: cache-sp-fortran - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/NCEPLIBS-sp key: cache-sp-fortran-${{matrix.fortran-compiler}}-key @@ -221,7 +221,7 @@ jobs: - name: Cache w3emc library v2.9.2 id: cache-w3emc-fortran - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/myw3emc key: cache-w3emc-fortran-${{matrix.fortran-compiler}}-key diff --git a/.github/workflows/ci_run_scm_DEPHY.yml b/.github/workflows/ci_run_scm_DEPHY.yml index eeba4c7fe..bc1193f24 100644 --- a/.github/workflows/ci_run_scm_DEPHY.yml +++ b/.github/workflows/ci_run_scm_DEPHY.yml @@ -28,7 +28,7 @@ jobs: # Initial ####################################################################################### - name: Checkout SCM code (into /home/runner/work/ccpp-scm/) - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Initialize submodules run: git submodule update --init --recursive @@ -37,7 +37,7 @@ jobs: # Python setup ####################################################################################### - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{matrix.py-version}} @@ -56,7 +56,7 @@ jobs: ####################################################################################### - name: Cache bacio library v2.4.1 id: cache-bacio-fortran - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/bacio key: cache-bacio-fortran-${{matrix.fortran-compiler}}-key @@ -73,7 +73,7 @@ jobs: - name: Cache SP-library v2.3.3 id: cache-sp-fortran - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/NCEPLIBS-sp key: cache-sp-fortran-${{matrix.fortran-compiler}}-key @@ -90,7 +90,7 @@ jobs: - name: Cache w3emc library v2.9.2 id: cache-w3emc-fortran - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/myw3emc key: cache-w3emc-fortran-${{matrix.fortran-compiler}}-key @@ -110,7 +110,7 @@ jobs: - name: Cache NetCDF Fortran library v4.4.4 id: cache-netcdf-fortran - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/netcdf-fortran key: cache-netcdf-fortran-${{matrix.fortran-compiler}}-key diff --git a/.github/workflows/ci_run_scm_rts.yml b/.github/workflows/ci_run_scm_rts.yml index d58a10cdd..24a26f3eb 100644 --- a/.github/workflows/ci_run_scm_rts.yml +++ b/.github/workflows/ci_run_scm_rts.yml @@ -32,7 +32,7 @@ jobs: # Initial ####################################################################################### - name: Checkout SCM code (into /home/runner/work/ccpp-scm/) - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Initialize submodules run: git submodule update --init --recursive @@ -41,7 +41,7 @@ jobs: # Python setup ####################################################################################### - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{matrix.py-version}} @@ -73,7 +73,7 @@ jobs: - name: Cache bacio library v2.4.1 id: cache-bacio-fortran - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/bacio key: cache-bacio-fortran-${{matrix.fortran-compiler}}-key @@ -90,7 +90,7 @@ jobs: - name: Cache SP-library v2.3.3 id: cache-sp-fortran - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/NCEPLIBS-sp key: cache-sp-fortran-${{matrix.fortran-compiler}}-key @@ -107,7 +107,7 @@ jobs: - name: Cache w3emc library v2.9.2 id: cache-w3emc-fortran - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/myw3emc key: cache-w3emc-fortran-${{matrix.fortran-compiler}}-key @@ -127,7 +127,7 @@ jobs: - name: Cache NetCDF Fortran library id: cache-netcdf-fortran - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/netcdf-fortran key: cache-netcdf-fortran-${{matrix.fortran-compiler}}-key @@ -196,7 +196,7 @@ jobs: ./cmp_rt2bl.py --build_type ${{matrix.build-type}} --dir_rt ${dir_rt} --dir_bl ${dir_bl} - name: Upload SCM RTs as GitHub Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: rt-baselines-${{matrix.build-type}} path: /home/runner/work/ccpp-scm/ccpp-scm/test/artifact-${{matrix.build-type}} diff --git a/.github/workflows/ci_run_scm_ufs_replay.yml b/.github/workflows/ci_run_scm_ufs_replay.yml index 0bd6a161d..508d3c490 100644 --- a/.github/workflows/ci_run_scm_ufs_replay.yml +++ b/.github/workflows/ci_run_scm_ufs_replay.yml @@ -23,7 +23,7 @@ jobs: ####################################################################################### - name: Checkout SCM. - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Initialize SCM submodules. run: git submodule update --init --recursive @@ -32,13 +32,13 @@ jobs: run: sudo apt-get update - name: Cache conda - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/conda_pkgs_dir key: conda-pkgs - name: Setup python. - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: activate-environment: env_ufsreplay environment-file: environment-ufsreplay.yml @@ -51,7 +51,7 @@ jobs: ####################################################################################### - name: Cache UWM regression test output. - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${dir_rt_cache} key: ufs-rt-files @@ -72,4 +72,4 @@ jobs: ####################################################################################### # Done - ####################################################################################### \ No newline at end of file + ####################################################################################### diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index bb9e3bd17..fbcaa169d 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -11,13 +11,13 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Initialize submodules run: git submodule update --init --recursive - + - name: Set up Python 3.8.5 - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: 3.8.5 From 8cb1c75b1d489c9c182de3cc32b1f70020d68a46 Mon Sep 17 00:00:00 2001 From: Soren Rasmussen Date: Wed, 22 May 2024 20:11:53 -0600 Subject: [PATCH 2/3] Pointing to bugfix/build_scm_nvfortran branch --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 6d8fccbea..bc62070cf 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 6d8fccbea12c11387c0bc457dcb3855574cd29aa +Subproject commit bc62070cf7b2fb14a1f01d714e2e842b80125cc7 From fdeba64abe6068701cfda562b441054500fb3a2a Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 4 Jun 2024 15:04:53 -0400 Subject: [PATCH 3/3] update ccpp/physics submodule --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index bc62070cf..76cf93fc2 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit bc62070cf7b2fb14a1f01d714e2e842b80125cc7 +Subproject commit 76cf93fc26d7b843f6d89ed0ba4799fd5f2c21f7