Skip to content

Commit

Permalink
Merge pull request #147 from GEOS-ESM/feature/mathomp4/update-cmake-env
Browse files Browse the repository at this point in the history
Update ESMA_env, ESMA_cmake, and MAPL
  • Loading branch information
sdrabenh authored May 27, 2020
2 parents f73f0b8 + 5636507 commit 05815d4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
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.3
tag = v2.1.5
protocol = git

[ESMA_cmake]
required = True
repo_url = [email protected]:GEOS-ESM/ESMA_cmake.git
local_path = ./@cmake
tag = v3.0.2
tag = v3.0.3
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.3
tag = v2.1.4
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.3
tag = v2.1.5
protocol = git

[ESMA_cmake]
required = True
repo_url = [email protected]:GEOS-ESM/ESMA_cmake.git
local_path = ./@cmake
tag = v3.0.2
tag = v3.0.3
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.3
tag = v2.1.4
protocol = git

[FMS]
Expand Down
8 changes: 4 additions & 4 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.3
tag: v2.1.5
develop: master

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

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

FMS:
local: ./src/Shared/@FMS
remote: ../FMS.git
tag: geos/2019.01.01
develop: geos/master
develop: geos/release/2019.01

GEOSgcm_GridComp:
local: ./src/Components/@GEOSgcm_GridComp
Expand Down

0 comments on commit 05815d4

Please sign in to comment.