Skip to content

Commit e74fdb1

Browse files
mathomp4mathomp4
authored
Merge pull request #894 from GEOS-ESM/develop
Sync develop into main
2 parents 9b06a8b + e2b79bd commit e74fdb1

File tree

30 files changed

+6296
-199
lines changed

30 files changed

+6296
-199
lines changed

‎.circleci/config.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
version: 2.1
22

33
# Anchors in case we need to override the defaults from the orb
4-
#baselibs_version: &baselibs_version v7.14.0
5-
#bcs_version: &bcs_version v11.1.0
4+
#baselibs_version: &baselibs_version v7.17.0
5+
#bcs_version: &bcs_version v11.4.0
66

77
orbs:
8-
ci: geos-esm/circleci-tools@1
8+
ci: geos-esm/circleci-tools@2
99

1010
workflows:
1111
build-test:

‎CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ set (alldirs
55
GEOSdataatm_GridComp
66
GEOSmkiau_GridComp
77
GEOSogcm_GridComp
8+
GEOSwgcm_GridComp
89
)
910

1011

0 commit comments

Comments
 (0)