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

Update CircleCI to use large, and update components.yaml #55

Merged
merged 3 commits into from
May 19, 2021
Merged

Update CircleCI to use large, and update components.yaml #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a21b033
Update CircleCI to use xlarge
mathomp4 May 10, 2021
c240043
Update config.yml
mathomp4 May 11, 2021
a004115
Fixes for CircleCI and components.yaml
mathomp4 May 13, 2021
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
12 changes: 6 additions & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/cmake@/
/env@/
/.mepo/
/ESMF/Shared/MAPL@/
/ESMF/Shared/GMAO_Shared@/
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
17 changes: 14 additions & 3 deletions components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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