Skip to content

Commit 1cee5b7

Browse files
authored
Merge branch 'develop' into feature/update-atlas-0.38.1
2 parents 9e2dae5 + 0f16f83 commit 1cee5b7

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

ci/build-and-test.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,19 @@ if command -v ompi_info &>/dev/null; then
3535
esac
3636
fi
3737

38+
atlas_orca_v=$(atlas --info |
39+
sed -n 's/ *atlas-orca version (\([0-9]*\.[0-9]*\.[0-9]*\)).*/\1/p')
40+
3841
echo "
3942
-------------------------------
4043
gcc version $(gcc -dumpversion ||:)
4144
$(ecbuild --version ||:)
4245
atlas version $(atlas --version ||:)
46+
atlas-orca version ${atlas_orca_v:-:}
4347
eckit version $(eckit-version ||:)
4448
ectrans version $(ectrans --version ||:)
4549
fckit version $(fckit --version ||:)
4650
fiat version $(fiat --version ||:)
47-
lz4 version $(lz4 --version ||:)
4851
odc version $(odc --version ||:)
4952
-------------------------------
5053
"

ci/hpccm_recipe_almalinux9.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def gitlab_url(repo, vn):
2222
# get versions via --userarg options
2323
# build hdf5/netcdf with zstd (libzstd from epel)
2424
atlas_orca_vn = USERARG.get('atlas_orca_vn', '0.3.1')
25-
atlas_vn = USERARG.get('atlas_vn', '0.37.0')
25+
atlas_vn = USERARG.get('atlas_vn', '0.38.1')
2626
blitz_vn = USERARG.get('blitz_vn', '1.0.2')
2727
boost_vn = USERARG.get('boost_vn', '1.85.0')
2828
bufr_query_vn = USERARG.get('bufr_query_vn', 'v0.0.1')

0 commit comments

Comments
 (0)