Skip to content

Commit

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

Update components and externals for main
  • Loading branch information
mathomp4 committed Jun 23, 2020
2 parents 1302089 + cdfec88 commit ce02d29
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ protocol = git
required = True
repo_url = git@github.com:GEOS-ESM/GMAO_Shared.git
local_path = ./src/Shared/@GMAO_Shared
branch = master
branch = main
protocol = git
sparse = ../../../config/GMAO_Shared.sparse

Expand Down
7 changes: 6 additions & 1 deletion components.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ env:
local: ./@env
remote: git@github.com:GEOS-ESM/ESMA_env.git
tag: v2.1.3+intel19.1.0
develop: main

cmake:
local: ./@cmake
remote: git@github.com:GEOS-ESM/ESMA_cmake.git
tag: v3.0.1
develop: develop

ecbuild:
local: ./@cmake/@ecbuild
Expand All @@ -17,16 +19,19 @@ GMAO_Shared:
local: ./src/Shared/@GMAO_Shared
remote: git@github.com:GEOS-ESM/GMAO_Shared.git
sparse: ./config/GMAO_Shared.sparse
branch: master
branch: main
develop: main

MAPL:
local: ./src/Shared/@MAPL
remote: git@github.com:GEOS-ESM/MAPL.git
tag: v2.1.3
develop: develop

GEOSgcm_GridComp:
local: ./src/Components/GEOSldas_GridComp/@GEOSgcm_GridComp
remote: git@github.com:GEOS-ESM/GEOSgcm_GridComp.git
sparse: ./config/GEOSgcm_GridComp_ldas.sparse
branch: develop
develop: develop

0 comments on commit ce02d29

Please sign in to comment.