Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to ESMA_cmake v4.6.0, ESMA_env v5.4.1 #820

Merged
merged 7 commits into from
Sep 27, 2024
Merged

Update to ESMA_cmake v4.6.0, ESMA_env v5.4.1 #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d2d90cd
Update to ESMA_cmake v4.6.0
mathomp4 Sep 5, 2024
c0dfbce
Update to ESMA_env v5.3.1
mathomp4 Sep 9, 2024
15ef530
Update to Orb 5 with v12 BCs
mathomp4 Sep 9, 2024
31741c0
Add landbcs_type option for coupled run
mathomp4 Sep 9, 2024
5bc9882
Move to CI Orb v5
mathomp4 Sep 10, 2024
c8995eb
Update to ESMA_env v5.4.1
mathomp4 Sep 18, 2024
414eac5
Update CI
mathomp4 Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 29 additions & 10 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ parameters:

# Anchors to prevent forgetting to update a version
os_version: &os_version ubuntu20
baselibs_version: &baselibs_version v8.5.0
bcs_version: &bcs_version v11.5.0
baselibs_version: &baselibs_version v8.6.0
bcs_version: &bcs_version v12.0.0
tag_build_arg_name: &tag_build_arg_name gcmversion

orbs:
ci: geos-esm/circleci-tools@3
ci: geos-esm/circleci-tools@5

workflows:
build-test:
Expand All @@ -45,11 +45,11 @@ workflows:
matrix:
parameters:
compiler: [gfortran, ifort]
baselibs_version: *baselibs_version
bcs_version: *bcs_version
requires:
- build-GEOSgcm-on-<< matrix.compiler >>
repo: GEOSgcm
baselibs_version: *baselibs_version
bcs_version: *bcs_version

# Run Coupled GCM (1 hour, no ExtData)
- ci/run_gcm:
Expand All @@ -59,11 +59,11 @@ workflows:
matrix:
parameters:
compiler: [ifort]
baselibs_version: *baselibs_version
bcs_version: *bcs_version
requires:
- build-GEOSgcm-on-<< matrix.compiler >>
repo: GEOSgcm
baselibs_version: *baselibs_version
bcs_version: *bcs_version
gcm_ocean_type: MOM6
change_layout: false

Expand All @@ -75,7 +75,7 @@ workflows:
filters:
tags:
only: /^v.*$/
name: publish-intel-docker-image
name: publish-ifort-docker-image
context:
- docker-hub-creds
- ghcr-creds
Expand All @@ -85,11 +85,30 @@ workflows:
container_name: geosgcm
mpi_name: intelmpi
mpi_version: "2021.13"
compiler_name: intel
compiler_version: "2024.2"
compiler_name: ifort
compiler_version: "2021.13"
image_name: geos-env-bcs
tag_build_arg_name: *tag_build_arg_name
resource_class: xlarge
#- ci/publish_docker:
#filters:
#tags:
#only: /^v.*$/
#name: publish-ifx-docker-image
#context:
#- docker-hub-creds
#- ghcr-creds
#os_version: *os_version
#baselibs_version: *baselibs_version
#bcs_version: *bcs_version
#container_name: geosgcm
#mpi_name: intelmpi
#mpi_version: "2021.13"
#compiler_name: ifx
#compiler_version: "2024.2"
#image_name: geos-env-bcs
#tag_build_arg_name: *tag_build_arg_name
#resource_class: xlarge
- ci/publish_docker:
filters:
tags:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')"
runs-on: ubuntu-latest
container:
image: gmao/ubuntu20-geos-env:v8.5.0-intelmpi_2021.13-intel_2024.2
image: gmao/ubuntu20-geos-env:v8.5.0-intelmpi_2021.13-ifort_2021.13-bcs_v12.0.0
# Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495
# It seems like we might not need secrets on GitHub Actions which is good for forked
# pull requests
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
| [CICE](https://github.com/GEOS-ESM/CICE) | [geos/v0.2.0](https://github.com/GEOS-ESM/CICE/releases/tag/geos%2Fv0.2.0) |
| [CPLFCST_Etc](https://github.com/GEOS-ESM/CPLFCST_Etc) | [v1.0.1](https://github.com/GEOS-ESM/CPLFCST_Etc/releases/tag/v1.0.1) |
| [ecbuild](https://github.com/GEOS-ESM/ecbuild) | [geos/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) |
| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.5.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.5.0) |
| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.3.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.3.0) |
| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.6.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.6.0) |
| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.4.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.4.1) |
| [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) |
| [geos-chem](https://github.com/GEOS-ESM/geos-chem) | [geos/v13.0.0-rc1](https://github.com/GEOS-ESM/geos-chem/releases/tag/geos%2Fv13.0.0-rc1) |
| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.3.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.3.0) |
Expand Down
4 changes: 2 additions & 2 deletions components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ GEOSgcm:
env:
local: ./@env
remote: ../ESMA_env.git
tag: v5.3.0
tag: v5.4.1
develop: main

cmake:
local: ./@cmake
remote: ../ESMA_cmake.git
tag: v4.5.0
tag: v4.6.0
develop: develop

ecbuild:
Expand Down