diff --git a/.circleci/config.yml b/.circleci/config.yml index 63f1211e..a68c416d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,8 +11,8 @@ executors: OMPI_ALLOW_RUN_AS_ROOT: 1 OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1 OMPI_MCA_btl_vader_single_copy_mechanism: none - #XLARGE# resource_class: xlarge - resource_class: medium + resource_class: large + #MEDIUM# resource_class: medium workflows: version: 2.1 @@ -52,8 +52,8 @@ jobs: name: "Build GOCART2G_GridComp" command: | cd ${CIRCLE_WORKING_DIRECTORY}/GOCART/build - #XLARGE# make -j"$(nproc)" install - make -j4 GOCART2G_GridComp + make -j"$(nproc)" GOCART2G_GridComp + #MEDIUM# make -j4 GOCART2G_GridComp build-GEOSgcm: executor: gcc-build-env @@ -88,5 +88,5 @@ jobs: name: "Build and install" command: | cd ${CIRCLE_WORKING_DIRECTORY}/GEOSgcm/build - #XLARGE# make -j"$(nproc)" install - make -j4 install + make -j"$(nproc)" install + #MEDIUM# make -j4 install diff --git a/.gitignore b/.gitignore index c7f3a7fa..52dd41df 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /cmake@/ +/env@/ /.mepo/ /ESMF/Shared/MAPL@/ /ESMF/Shared/GMAO_Shared@/ diff --git a/CHANGELOG.md b/CHANGELOG.md index ce45e628..cea1f966 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Updated `CODEOWNERS` to reflect changes in staffing -- Updated `components.yaml` for latest MAPL +- Updated `components.yaml` + - Added fixture block + - Added ESMA_env 3.2.1 + - Updated ESMA_cmake to 3.4.0 + - Updated GMAO_Shared to 1.4.0 + - Updated MAPL to v2.6.7 +- Updated CircleCI to use `large` resource ### Fixed diff --git a/components.yaml b/components.yaml index 776115e0..3bb4d448 100644 --- a/components.yaml +++ b/components.yaml @@ -1,7 +1,17 @@ +GOCART: + fixture: true + develop: develop + +env: + local: ./env@ + remote: ../ESMA_env.git + tag: v3.2.1 + develop: main + cmake: local: ./cmake@ remote: ../ESMA_cmake.git - tag: v3.3.6 + tag: v3.4.0 develop: develop ecbuild: @@ -17,11 +27,12 @@ HEMCO: GMAO_Shared: local: ./ESMF/Shared/GMAO_Shared@ remote: ../GMAO_Shared.git - tag: v1.3.8 + tag: v1.4.0 sparse: ./config/GMAO_Shared.sparse develop: main MAPL: local: ./ESMF/Shared/MAPL@ remote: ../MAPL.git - branch: develop + tag: v2.6.7 + develop: develop