Skip to content

Commit

Permalink
Merge pull request #63 from GEOS-ESM/feature/mathomp4/update-ci-compo…
Browse files Browse the repository at this point in the history
…nents-gocart

Fix CI and Update components
  • Loading branch information
mathomp4 authored Jul 8, 2021
2 parents ebcbc31 + 49f9d1c commit bfb9672
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2.1
executors:
gcc-build-env:
docker:
- image: gmao/ubuntu20-geos-env-mkl:v6.1.0-openmpi_4.0.5-gcc_10.2.0
- image: gmao/ubuntu20-geos-env-mkl:v6.2.4-openmpi_4.0.5-gcc_10.3.0
auth:
username: $DOCKERHUB_USER
password: $DOCKERHUB_AUTH_TOKEN
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/changelog-enforcer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,11 @@ jobs:
with:
changeLogPath: 'CHANGELOG.md'
skipLabels: 'Skip Changelog,0 diff trivial'
missingUpdateErrorMessage: >
No update to CHANGELOG.md found! Please add a changelog
entry to it describing your change. Please note that the
keepachangelog (https://keepachangelog.com) format is
used. If your change is very trivial not applicable for a
changelog entry, add a 'Skip Changelog' label to the pull
request to skip the changelog enforcer.
10 changes: 5 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Updated `CODEOWNERS` to reflect changes in staffing
- 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
- Added ESMA_env 3.3.0
- Updated ESMA_cmake to 3.5.0
- Updated GMAO_Shared to 1.4.3
- Updated MAPL to v2.7.0
- Updated CircleCI to use `large` resource and v6.2.4 Baselibs
- Rename BUILD_UFS CMake flag as UFS_GOCART
- Rename UFS target as UFS_Aerosols
- Add CMake macros replacing ecBuild and ESMA_cmake for the UFS
Expand Down
8 changes: 4 additions & 4 deletions components.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ GOCART:
env:
local: ./env@
remote: ../ESMA_env.git
tag: v3.2.1
tag: v3.3.0
develop: main

cmake:
local: ./cmake@
remote: ../ESMA_cmake.git
tag: v3.4.0
tag: v3.5.0
develop: develop

ecbuild:
Expand All @@ -27,12 +27,12 @@ HEMCO:
GMAO_Shared:
local: ./ESMF/Shared/GMAO_Shared@
remote: ../GMAO_Shared.git
tag: v1.4.0
tag: v1.4.3
sparse: ./config/GMAO_Shared.sparse
develop: main

MAPL:
local: ./ESMF/Shared/MAPL@
remote: ../MAPL.git
tag: v2.6.7
tag: v2.7.0
develop: develop

0 comments on commit bfb9672

Please sign in to comment.