Skip to content

Commit

Permalink
Merge pull request #145 from GEOS-ESM/feature/mathomp4/update-to-mapl…
Browse files Browse the repository at this point in the history
…-213

Update to MAPL v2.1.3
  • Loading branch information
sdrabenh authored May 5, 2020
2 parents c1ac55e + 6426036 commit 66819cb
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build:
docker:
- image: gmao/geos-build-env-gcc-source:6.0.11
- image: gmao/geos-build-env-gcc-source:6.0.12
working_directory: /root/project
steps:
- checkout
Expand Down
6 changes: 4 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
# Everything in GEOSgcm should be owned by the GCM Gatekeepers
* @GEOS-ESM/gcm-gatekeepers

# The GCM gatekeepers and CMake should know/approve these
/.circleci/ @GEOS-ESM/cmake-team @GEOS-ESM/gcm-gatekeepers

# The GEOS CMake Team is the CODEOWNER for the CMakeLists.txt files in this repository
CMakeLists.txt @GEOS-ESM/cmake-team

# The GEOS CMake Team should be notified about CircleCI and config changes
/.circleci/ @GEOS-ESM/cmake-team
# The GEOS CMake Team should be notified about and approve config changes
/config/ @GEOS-ESM/cmake-team
6 changes: 3 additions & 3 deletions Develop.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
required = True
repo_url = [email protected]:GEOS-ESM/ESMA_env.git
local_path = ./@env
tag = v2.1.2
tag = v2.1.3
protocol = git

[ESMA_cmake]
required = True
repo_url = [email protected]:GEOS-ESM/ESMA_cmake.git
local_path = ./@cmake
tag = v3.0.1
tag = v3.0.2
externals = Externals.cfg
protocol = git

Expand Down Expand Up @@ -40,7 +40,7 @@ protocol = git
required = True
repo_url = [email protected]:GEOS-ESM/MAPL.git
local_path = ./src/Shared/@MAPL
tag = v2.1.2
tag = v2.1.3
protocol = git

[FMS]
Expand Down
6 changes: 3 additions & 3 deletions Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
required = True
repo_url = [email protected]:GEOS-ESM/ESMA_env.git
local_path = ./@env
tag = v2.1.2
tag = v2.1.3
protocol = git

[ESMA_cmake]
required = True
repo_url = [email protected]:GEOS-ESM/ESMA_cmake.git
local_path = ./@cmake
tag = v3.0.1
tag = v3.0.2
externals = Externals.cfg
protocol = git

Expand Down Expand Up @@ -40,7 +40,7 @@ protocol = git
required = True
repo_url = [email protected]:GEOS-ESM/MAPL.git
local_path = ./src/Shared/@MAPL
tag = v2.1.2
tag = v2.1.3
protocol = git

[FMS]
Expand Down
6 changes: 3 additions & 3 deletions components.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
env:
local: ./@env
remote: ../ESMA_env.git
tag: v2.1.2
tag: v2.1.3
develop: master

cmake:
local: ./@cmake
remote: ../ESMA_cmake.git
tag: v3.0.1
tag: v3.0.2
develop: develop

ecbuild:
Expand Down Expand Up @@ -37,7 +37,7 @@ GSW-Fortran:
MAPL:
local: ./src/Shared/@MAPL
remote: ../MAPL.git
tag: v2.1.2
tag: v2.1.3
develop: develop

FMS:
Expand Down

0 comments on commit 66819cb

Please sign in to comment.