Skip to content

Commit

Permalink
Merge pull request #565 from GEOS-ESM/feature/mathomp4/update-compone…
Browse files Browse the repository at this point in the history
…nts-ldas

Update ESMA_cmake, ESMA_env, MAPL
  • Loading branch information
mathomp4 authored Jun 17, 2022
2 parents fc23bca + c40ee94 commit 0bb0796
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 34 deletions.
42 changes: 11 additions & 31 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,22 @@
version: 2.1

# Anchor to prevent forgetting to update a version
baselibs_version: &baselibs_version v6.3.1

orbs:
circleci-tools: geos-esm/circleci-tools@0.13.0
ci: geos-esm/circleci-tools@1

workflows:
build-test:
jobs:
- build-GEOSldas:
- ci/build:
name: build-GEOSldas-on-<< matrix.compiler >>
matrix:
parameters:
compiler: [gfortran, ifort]
context:
- docker-hub-creds

jobs:
build-GEOSldas:
parameters:
compiler:
type: string
executor:
name: circleci-tools/<< parameters.compiler >>
resource_class: large
working_directory: /root/project
steps:
- checkout:
path: GEOSldas
- circleci-tools/versions:
compiler: << parameters.compiler >>
- circleci-tools/mepoclone:
repo: GEOSldas
- circleci-tools/checkout_if_exists:
repo: GEOSldas
- circleci-tools/cmake:
repo: GEOSldas
compiler: << parameters.compiler >>
- circleci-tools/buildinstall:
matrix:
parameters:
compiler: [ifort, gfortran]
baselibs_version: *baselibs_version
repo: GEOSldas
- circleci-tools/compress_artifacts
- store_artifacts:
path: /logfiles
mepodevelop: false
persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra
6 changes: 3 additions & 3 deletions components.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ GEOSldas:
env:
local: ./@env
remote: ../ESMA_env.git
tag: v3.13.0
tag: v3.14.0
develop: main

cmake:
local: ./@cmake
remote: ../ESMA_cmake.git
tag: v3.12.0
tag: v3.17.0
develop: develop

ecbuild:
Expand All @@ -29,7 +29,7 @@ GMAO_Shared:
MAPL:
local: ./src/Shared/@MAPL
remote: ../MAPL.git
tag: v2.19.0
tag: v2.21.3
develop: develop

GEOSgcm_GridComp:
Expand Down

0 comments on commit 0bb0796

Please sign in to comment.