Skip to content

Commit 36f9264

Browse files
committed
Merge branch 'develop' into release/MAPL-v3
2 parents 881bbea + 2d96b32 commit 36f9264

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ parameters:
1616

1717
# Anchors to prevent forgetting to update a version
1818
os_version: &os_version ubuntu24
19-
baselibs_version: &baselibs_version v8.20.0
19+
baselibs_version: &baselibs_version v8.24.0
2020
bcs_version: &bcs_version v11.6.0
2121
tag_build_arg_name: &tag_build_arg_name maplversion
2222

@@ -219,9 +219,9 @@ workflows:
219219
baselibs_version: *baselibs_version
220220
container_name: mapl
221221
mpi_name: intelmpi
222-
mpi_version: "2021.16"
222+
mpi_version: "2021.17"
223223
compiler_name: ifx
224-
compiler_version: "2025.2"
224+
compiler_version: "2025.3"
225225
image_name: geos-env
226226
tag_build_arg_name: *tag_build_arg_name
227227
- ci/publish_docker:

.github/workflows/workflow.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
name: gfortran / ${{ matrix.cmake-build-type }} / ${{ matrix.cmake-generator }}
3939
runs-on: ubuntu-latest
4040
container:
41-
image: gmao/ubuntu24-geos-env-mkl:v8.20.0-openmpi_5.0.5-gcc_14.2.0
41+
image: gmao/ubuntu24-geos-env-mkl:v8.24.0-openmpi_5.0.5-gcc_14.2.0
4242
strategy:
4343
fail-fast: false
4444
matrix:
@@ -67,7 +67,7 @@ jobs:
6767
name: gfortran-15 / ${{ matrix.cmake-build-type }} / ${{ matrix.cmake-generator }}
6868
runs-on: ubuntu-latest
6969
container:
70-
image: gmao/ubuntu24-geos-env-mkl:v8.20.0-openmpi_5.0.5-gcc_15.2.0
70+
image: gmao/ubuntu24-geos-env-mkl:v8.24.0-openmpi_5.0.5-gcc_15.2.0
7171
strategy:
7272
fail-fast: false
7373
matrix:
@@ -96,7 +96,7 @@ jobs:
9696
name: ifort / ${{ matrix.cmake-build-type }} / ${{ matrix.cmake-generator }}
9797
runs-on: ubuntu-latest
9898
container:
99-
image: gmao/ubuntu24-geos-env:v8.20.0-intelmpi_2021.13-ifort_2021.13
99+
image: gmao/ubuntu24-geos-env:v8.24.0-intelmpi_2021.13-ifort_2021.13
100100
strategy:
101101
fail-fast: false
102102
matrix:
@@ -120,7 +120,7 @@ jobs:
120120
name: ifx / ${{ matrix.cmake-build-type }} / ${{ matrix.cmake-generator }}
121121
runs-on: ubuntu-latest
122122
container:
123-
image: gmao/ubuntu24-geos-env:v8.20.0-intelmpi_2021.16-ifx_2025.2
123+
image: gmao/ubuntu24-geos-env:v8.24.0-intelmpi_2021.17-ifx_2025.3
124124
strategy:
125125
fail-fast: false
126126
matrix:

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
112112

113113
### Changed
114114

115+
- Updated CI to use Baselibs 8.24.0
116+
- This provides ESMF 9.0.0b08
117+
- Update ifx tests to 2025.3 (enabled by ESMF 9.0.0b08)
118+
115119
### Removed
116120

117121
### Deprecated

0 commit comments

Comments
 (0)