ci/Update container to atlas v0.38.1 (#114)

* Update container to atlas v0.38.1
MetOffice · Aug 15, 2024 · 0f16f83 · 0f16f83
1 parent 8bffcfc
commit 0f16f83
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ on:
     branches: [develop]
 env:
     REGISTRY: ghcr.io
-    IMAGE_NAME: twsearle/orca-jedi/ci-almalinux9:feature-use-personal-ghcr-container
+    IMAGE_NAME: twsearle/orca-jedi/ci-almalinux9:v1.2.0
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/ci/build-and-test.sh b/ci/build-and-test.sh
@@ -35,16 +35,19 @@ if command -v ompi_info &>/dev/null; then
     esac
 fi
 
+atlas_orca_v=$(atlas --info |
+  sed -n 's/ *atlas-orca version (\([0-9]*\.[0-9]*\.[0-9]*\)).*/\1/p')
+
 echo "
 -------------------------------
 gcc version $(gcc -dumpversion ||:)
 $(ecbuild --version ||:)
 atlas version $(atlas --version ||:)
+atlas-orca version ${atlas_orca_v:-:}
 eckit version $(eckit-version ||:)
 ectrans version $(ectrans --version ||:)
 fckit version $(fckit --version ||:)
 fiat version $(fiat --version ||:)
-lz4 version $(lz4 --version ||:)
 odc version $(odc --version ||:)
 -------------------------------
 "

diff --git a/ci/hpccm_recipe_almalinux9.py b/ci/hpccm_recipe_almalinux9.py
@@ -22,7 +22,7 @@ def gitlab_url(repo, vn):
 # get versions via --userarg options
 # build hdf5/netcdf with zstd (libzstd from epel)
 atlas_orca_vn = USERARG.get('atlas_orca_vn', '0.3.1')
-atlas_vn = USERARG.get('atlas_vn', '0.37.0')
+atlas_vn = USERARG.get('atlas_vn', '0.38.1')
 blitz_vn = USERARG.get('blitz_vn', '1.0.2')
 boost_vn = USERARG.get('boost_vn', '1.85.0')
 bufr_query_vn = USERARG.get('bufr_query_vn', 'v0.0.1')