Updating CICD with the new cmake build system

makepath-alex · Nov 25, 2024 · 7b2e58a · 7b2e58a
1 parent 2df8789
commit 7b2e58a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/.github/workflows/check-api.yml b/.github/workflows/check-api.yml
@@ -19,6 +19,7 @@ jobs:
       FCFLAGS: "-ffree-line-length-none -m64 -std=f2008 -march=native -fbounds-check -fmodule-private -fimplicit-none -finit-real=nan -g -DRTE_USE_CBOOL"
       RRTMGP_ROOT: ${{ github.workspace }}
       RTE_KERNELS: extern
+      RRTMGP_DATA_VERSION: v1.18.2
     steps:
     #
     # Check out repository under $GITHUB_WORKSPACE
@@ -31,6 +32,9 @@ jobs:
     - name: Build libraries
       run: |
         $FC --version
-        mkdir -p build_libs
-        cmake -S . -B build_libs -DCMAKE_Fortran_COMPILER=$FC
-        cmake --build build_libs --config Release -- -j8
+        cmake -S . -B build \
+            -DCMAKE_Fortran_COMPILER=$FC \
+            -DCMAKE_Fortran_FLAGS="$FCFLAGS" \
+            -DRRTMGP_DATA_VERSION=$RRTMGP_DATA_VERSION \
+            -DRTE_KERNEL_MODE=$RTE_KERNELS
+        cmake --build build --config Release -- -j8
diff --git a/.github/workflows/containerized-ci.yml b/.github/workflows/containerized-ci.yml
@@ -60,6 +60,13 @@ jobs:
       FAILURE_THRESHOLD: 7.e-4
 
     steps:
+    - name: Synchronize the package index
+      run: sudo apt-get update
+    #
+    # Install NetCDF-Fortran (compatible with all compilers)
+    #
+    - name: Install NetCDF-Fortran
+      run: sudo apt-get install libnetcdff-dev
     #
     # Build libraries, examples and tests (expect success)
     #
@@ -83,7 +90,7 @@ jobs:
     - name: Run examples and tests
       if: steps.build-success.outcome != 'skipped'
       run: |
-        ctest -v --test-dir build
+        ctest -V --test-dir build
     #
     # Relax failure thresholds for single precision
     #

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -48,13 +48,6 @@ jobs:
     #
     # Check out data
     #
-    - name: Check out data
-      uses: actions/checkout@v4
-      with:
-        repository: earth-system-radiation/rrtmgp-data
-        path: rrtmgp-data
-        ref: v1.8.2
-    #
     # Synchronize the package index
     #
     - name: Synchronize the package index

diff --git a/environment-noplots.yml b/environment-noplots.yml
@@ -9,3 +9,4 @@ dependencies:
   - xarray
   - dask
   - numpy
+  - cmake
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,3 +9,4 @@ dependencies: @@
       - xarray
       - dask
       - numpy
+      - cmake