From b2e1223b01b9dde62559916b0ea3431297b344b7 Mon Sep 17 00:00:00 2001
From: Dusan Jovic <dusan.jovic@noaa.gov>
Date: Wed, 20 Mar 2024 20:08:23 +0000
Subject: [PATCH] Split GCC.yml workflow into two jobs, build_spack and
 build_fv3atm

---
 .github/workflows/GCC.yml | 38 +++++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/GCC.yml b/.github/workflows/GCC.yml
index 2c594b924..2fd0ba6a1 100644
--- a/.github/workflows/GCC.yml
+++ b/.github/workflows/GCC.yml
@@ -15,21 +15,16 @@ on:
     - develop
 
 jobs:
-  GCC:
+  build_spack:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        cmake_opts: ["-D32BIT=ON", "-D32BIT=OFF"]
         gcc_ver: ["12"]
         mpi: ["openmpi"]
 
     steps:
 
-    - name: install-doxygen
-      run: |
-        sudo apt-get install doxygen graphviz
-
     - name: checkout-fv3atm
       uses: actions/checkout@v3
       with:
@@ -41,7 +36,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ${{ github.workspace }}/spack-develop
-        key: spack-${{ hashFiles('fv3atm/ci/spack.yaml') }}-gcc${{ matrix.gcc_ver }}-${{ matrix.mpi }}-${{ matrix.cmake_opts }}
+        key: spack-${{ hashFiles('fv3atm/ci/spack.yaml') }}-gcc${{ matrix.gcc_ver }}-${{ matrix.mpi }}
 
     # Building dependencies takes 40+ min
     - name: spack-install
@@ -60,6 +55,35 @@ jobs:
         spack install -j2 --fail-fast
         spack clean --all
 
+  build_fv3atm:
+    needs: build_spack
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        cmake_opts: ["-D32BIT=ON", "-D32BIT=OFF"]
+        gcc_ver: ["12"]
+        mpi: ["mpich", "openmpi"]
+
+    steps:
+
+    - name: install-doxygen
+      run: |
+        sudo apt-get install doxygen graphviz
+
+    - name: checkout-fv3atm
+      uses: actions/checkout@v3
+      with:
+        path: ${{ github.workspace }}/fv3atm
+        submodules: recursive
+
+    - name: cache-spack
+      id: cache-spack
+      uses: actions/cache@v3
+      with:
+        path: ${{ github.workspace }}/spack-develop
+        key: spack-${{ hashFiles('fv3atm/ci/spack.yaml') }}-gcc${{ matrix.gcc_ver }}-${{ matrix.mpi }}
+
     - name: build-fv3atm
       run: |
         . ${GITHUB_WORKSPACE}/spack-develop/share/spack/setup-env.sh