From 8341690f1af649ec4e2a7152bba3c24ab8607d9e Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 12 Dec 2024 16:09:00 +0000 Subject: [PATCH 1/5] Backtrack to ubuntu 22.04 --- .github/workflows/ubuntu_gcc.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu_gcc.yaml b/.github/workflows/ubuntu_gcc.yaml index 850434efe..fa5938ed7 100644 --- a/.github/workflows/ubuntu_gcc.yaml +++ b/.github/workflows/ubuntu_gcc.yaml @@ -23,7 +23,7 @@ env: jobs: setup: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: checkout # this is to get the ci/spack.yaml file @@ -59,7 +59,7 @@ jobs: ufs_utils: needs: setup - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: checkout From 51f105fb4fefb9715225d043b4415c89fa33e3a1 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 12 Dec 2024 17:01:43 +0000 Subject: [PATCH 2/5] Update ubuntu for ubuntu_intel.yaml. --- .github/workflows/ubuntu_intel.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu_intel.yaml b/.github/workflows/ubuntu_intel.yaml index 20c7f7841..e62c0b531 100644 --- a/.github/workflows/ubuntu_intel.yaml +++ b/.github/workflows/ubuntu_intel.yaml @@ -26,7 +26,7 @@ env: jobs: setup: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: checkout # this is to get the ci/spack.yaml file @@ -78,7 +78,7 @@ jobs: ufs_utils: needs: setup - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: install-intel From 7e6b0767c1bdd13a8903d238ad405ee4f7d0ecf7 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 12 Dec 2024 18:03:11 +0000 Subject: [PATCH 3/5] Revert to previous ubuntu_intel.yaml. Previous change broke in setup. --- .github/workflows/ubuntu_intel.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu_intel.yaml b/.github/workflows/ubuntu_intel.yaml index e62c0b531..20c7f7841 100644 --- a/.github/workflows/ubuntu_intel.yaml +++ b/.github/workflows/ubuntu_intel.yaml @@ -26,7 +26,7 @@ env: jobs: setup: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - name: checkout # this is to get the ci/spack.yaml file @@ -78,7 +78,7 @@ jobs: ufs_utils: needs: setup - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - name: install-intel From b246d261c33f3aa7f44c48202dd6216e48794453 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 12 Dec 2024 18:12:47 +0000 Subject: [PATCH 4/5] Try gnu 12. --- .github/workflows/ubuntu_gcc.yaml | 8 ++++---- ci/spack.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ubuntu_gcc.yaml b/.github/workflows/ubuntu_gcc.yaml index fa5938ed7..40e271841 100644 --- a/.github/workflows/ubuntu_gcc.yaml +++ b/.github/workflows/ubuntu_gcc.yaml @@ -10,9 +10,9 @@ defaults: env: cache_key: gcc - CC: gcc-10 - FC: gfortran-10 - CXX: g++-10 + CC: gcc-12 + FC: gfortran-12 + CXX: g++-12 # The jobs are split into: # 1. a dependency build step (setup), and @@ -47,7 +47,7 @@ jobs: run: | git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git source spack/share/spack/setup-env.sh - sed "s/\[oneapi, gcc@10:10, apple-clang@14\]/\[gcc@10:10\]/g" ufs_utils/ci/spack.yaml > spack_ci.yaml + sed "s/\[oneapi, gcc@12:12, apple-clang@14\]/\[gcc@12:12\]/g" ufs_utils/ci/spack.yaml > spack_ci.yaml spack env create ufs_utils-env spack_ci.yaml spack env activate ufs_utils-env sudo apt install cmake diff --git a/ci/spack.yaml b/ci/spack.yaml index ee8a4ee1b..9fae4f37b 100644 --- a/ci/spack.yaml +++ b/ci/spack.yaml @@ -2,7 +2,7 @@ spack: packages: all: - compiler: [oneapi, gcc@10:10, apple-clang@14] + compiler: [oneapi, gcc@12:12, apple-clang@14] specs: - netcdf-c@4.9.2 - netcdf-fortran@4.6.1 From 17e7506d4500e4dd77d1a0b6fa731a08e5884064 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 12 Dec 2024 19:12:05 +0000 Subject: [PATCH 5/5] Try gnu 13 and ubuntu 24.04 --- .github/workflows/ubuntu_gcc.yaml | 12 ++++++------ ci/spack.yaml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ubuntu_gcc.yaml b/.github/workflows/ubuntu_gcc.yaml index 40e271841..2b48194b6 100644 --- a/.github/workflows/ubuntu_gcc.yaml +++ b/.github/workflows/ubuntu_gcc.yaml @@ -10,9 +10,9 @@ defaults: env: cache_key: gcc - CC: gcc-12 - FC: gfortran-12 - CXX: g++-12 + CC: gcc-13 + FC: gfortran-13 + CXX: g++-13 # The jobs are split into: # 1. a dependency build step (setup), and @@ -23,7 +23,7 @@ env: jobs: setup: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: checkout # this is to get the ci/spack.yaml file @@ -47,7 +47,7 @@ jobs: run: | git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git source spack/share/spack/setup-env.sh - sed "s/\[oneapi, gcc@12:12, apple-clang@14\]/\[gcc@12:12\]/g" ufs_utils/ci/spack.yaml > spack_ci.yaml + sed "s/\[oneapi, gcc@13:13, apple-clang@14\]/\[gcc@13:13\]/g" ufs_utils/ci/spack.yaml > spack_ci.yaml spack env create ufs_utils-env spack_ci.yaml spack env activate ufs_utils-env sudo apt install cmake @@ -59,7 +59,7 @@ jobs: ufs_utils: needs: setup - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: checkout diff --git a/ci/spack.yaml b/ci/spack.yaml index 9fae4f37b..567d894a9 100644 --- a/ci/spack.yaml +++ b/ci/spack.yaml @@ -2,7 +2,7 @@ spack: packages: all: - compiler: [oneapi, gcc@12:12, apple-clang@14] + compiler: [oneapi, gcc@13:13, apple-clang@14] specs: - netcdf-c@4.9.2 - netcdf-fortran@4.6.1