Skip to content

Commit 910d679

Browse files
committed
Update components to match GEOSgcm v11 as of 2025-Sep-19
1 parent 152d349 commit 910d679

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2.1
22

33
# Anchors in case we need to override the defaults from the orb
4-
#baselibs_version: &baselibs_version v7.33.0
4+
#baselibs_version: &baselibs_version v8.18.0
55
#bcs_version: &bcs_version v11.6.0
66

77
orbs:

.github/workflows/release-tarball.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ jobs:
1010

1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1414
with:
1515
path: ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}
1616

1717
- name: Setup Python
18-
uses: actions/setup-python@v5
18+
uses: actions/setup-python@v6
1919
with:
2020
python-version: '3.11'
2121

.github/workflows/workflow.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
name: gfortran / ${{ matrix.cmake-build-type }} / ${{ matrix.cmake-generator }}
2121
runs-on: ubuntu-latest
2222
container:
23-
image: gmao/ubuntu24-geos-env-mkl:v7.33.0-openmpi_5.0.5-gcc_14.2.0
23+
image: gmao/ubuntu24-geos-env-mkl:v8.18.0-openmpi_5.0.5-gcc_14.2.0
2424
strategy:
2525
fail-fast: false
2626
matrix:
@@ -32,7 +32,7 @@ jobs:
3232
OMPI_MCA_btl_vader_single_copy_mechanism: none
3333
steps:
3434
- name: Checkout
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@v5
3636
with:
3737
fetch-depth: 1
3838
filter: blob:none
@@ -49,15 +49,15 @@ jobs:
4949
name: ifort / ${{ matrix.cmake-build-type }} / ${{ matrix.cmake-generator }}
5050
runs-on: ubuntu-latest
5151
container:
52-
image: gmao/ubuntu24-geos-env:v7.33.0-intelmpi_2021.13-ifort_2021.13
52+
image: gmao/ubuntu24-geos-env:v8.18.0-intelmpi_2021.13-ifort_2021.13
5353
strategy:
5454
fail-fast: false
5555
matrix:
5656
cmake-build-type: [Debug, Release]
5757
cmake-generator: [Unix Makefiles]
5858
steps:
5959
- name: Checkout
60-
uses: actions/checkout@v4
60+
uses: actions/checkout@v5
6161
with:
6262
fetch-depth: 1
6363
filter: blob:none
@@ -77,15 +77,15 @@ jobs:
7777
# name: ifx / ${{ matrix.cmake-build-type }} / ${{ matrix.cmake-generator }} #
7878
# runs-on: ubuntu-latest #
7979
# container: #
80-
# image: gmao/ubuntu24-geos-env:v7.33.0-intelmpi_2021.14-ifx_2025.0 #
80+
# image: gmao/ubuntu24-geos-env:v8.18.0-intelmpi_2021.15-ifx_2025.1 #
8181
# strategy: #
8282
# fail-fast: false #
8383
# matrix: #
8484
# cmake-build-type: [Debug, Release] #
8585
# cmake-generator: [Unix Makefiles] #
8686
# steps: #
8787
# - name: Checkout #
88-
# uses: actions/checkout@v4 #
88+
# uses: actions/checkout@v5 #
8989
# with: #
9090
# fetch-depth: 1 #
9191
# filter: blob:none #

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ if (NOT Baselibs_FOUND)
7575
# Another issue with historical reasons, old/wrong zlib target used in GEOS
7676
add_library(ZLIB::zlib ALIAS ZLIB::ZLIB)
7777

78-
find_package(MAPL 2.57 QUIET)
78+
find_package(MAPL 2.59 QUIET)
7979
if (MAPL_FOUND)
8080
message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"")
8181
endif ()

components.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ GEOSldas:
55
env:
66
local: ./@env
77
remote: ../ESMA_env.git
8-
tag: v4.38.0
8+
tag: v5.13.0
99
develop: main
1010

1111
cmake:
1212
local: ./@cmake
1313
remote: ../ESMA_cmake.git
14-
tag: v3.62.1
14+
tag: v3.64.0
1515
develop: develop
1616

1717
ecbuild:
@@ -29,14 +29,14 @@ NCEP_Shared:
2929
GMAO_Shared:
3030
local: ./src/Shared/@GMAO_Shared
3131
remote: ../GMAO_Shared.git
32-
tag: v2.1.1
32+
tag: v2.1.4
3333
sparse: ./config/GMAO_Shared.sparse
3434
develop: main
3535

3636
GEOS_Util:
3737
local: ./src/Shared/@GMAO_Shared/@GEOS_Util
3838
remote: ../GEOS_Util.git
39-
tag: v2.1.9
39+
tag: v2.1.10
4040
sparse: ./config/GEOS_Util.sparse
4141
develop: main
4242

@@ -51,7 +51,7 @@ GMAO_perllib:
5151
MAPL:
5252
local: ./src/Shared/@MAPL
5353
remote: ../MAPL.git
54-
tag: v2.57.0
54+
tag: v2.59.1
5555
develop: develop
5656

5757
GEOSldas_GridComp:

0 commit comments

Comments
 (0)