Skip to content

Commit

Permalink
Merge branch 'main' into feature/mathomp4/fms-baselibs
Browse files Browse the repository at this point in the history
  • Loading branch information
mathomp4 authored Jul 12, 2023
2 parents fa0496f + 9bcb9ef commit 882d503
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ parameters:
# Anchors to prevent forgetting to update a version
os_version: &os_version ubuntu20
baselibs_version: &baselibs_version v7.13.0
bcs_version: &bcs_version v11.00.0
bcs_version: &bcs_version v11.1.0
tag_build_arg_name: &tag_build_arg_name gcmversion

orbs:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
| [CICE](https://github.com/GEOS-ESM/CICE) | [geos/v0.0.1](https://github.com/GEOS-ESM/CICE/releases/tag/geos%2Fv0.0.1) |
| [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) | [v3.29.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.29.0) |
| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.30.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.30.0) |
| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.17.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.17.0) |
| [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.4.4](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.4.4) |
| [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.5.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.5.0) |
| [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) | [v2.1.1](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.1.1) |
| [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.0.0](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.0.0) |
Expand All @@ -30,7 +30,7 @@
| [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.9.1](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.1) |
| [GOCART](https://github.com/GEOS-ESM/GOCART) | [sdr_v2.1.2.7](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.1.2.7) |
| [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3) |
| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.39.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.39.1) |
| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.39.4](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.39.4) |
| [MITgcm](https://github.com/GEOS-ESM/MITgcm) | [checkpoint68o](https://github.com/GEOS-ESM/MITgcm/releases/tag/checkpoint68o) |
| [MOM5](https://github.com/GEOS-ESM/MOM5) | [geos/5.1.0+1.2.0](https://github.com/GEOS-ESM/MOM5/releases/tag/geos%2F5.1.0%2B1.2.0) |
| [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v2.2.0](https://github.com/GEOS-ESM/MOM6/tree/geos/v2.2.0) |
Expand Down
4 changes: 2 additions & 2 deletions components.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ GEOS_Util:
MAPL:
local: ./src/Shared/@MAPL
remote: ../MAPL.git
tag: v2.39.1
tag: v2.39.4
develop: develop

GEOSgcm_GridComp:
Expand All @@ -55,7 +55,7 @@ GEOSgcm_GridComp:
FVdycoreCubed_GridComp:
local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp
remote: ../FVdycoreCubed_GridComp.git
tag: v2.4.4
tag: v2.5.0
develop: develop

fvdycore:
Expand Down

0 comments on commit 882d503

Please sign in to comment.