Skip to content

Commit 4dd0095

Browse files
Update GMT caches for testings (#4004) (#4005)
Co-authored-by: Dongdong Tian <[email protected]>
1 parent 2f3bbc5 commit 4dd0095

File tree

3 files changed

+28
-25
lines changed

3 files changed

+28
-25
lines changed

ci/azure-pipelines-linux.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ steps:
4242
# Cache the ${HOME}/.gmt directory, for docs and testing
4343
- task: Cache@2
4444
inputs:
45-
key: cachedata | 20200814
45+
key: cachedata | 20200820-3
4646
path: $(HOME)/.gmt
4747
cacheHitVar: CACHE_CACHEDATA_RESTORED
4848
displayName: Cache GMT remote data for testing
@@ -78,16 +78,10 @@ steps:
7878
gmt earthtide -T2018-06-18T12:00:00 -Gsolid_tide_up.grd
7979
displayName: Check a few simple commands
8080

81-
# Download remote files, if not already cached
81+
# Download remote files, if not already cached [Linux agents always fail]
8282
- bash: |
8383
set -x -e
84-
gmt get -Dcache
85-
gmt which -Ga @earth_relief_30m @earth_relief_20m @earth_relief_15m \
86-
@earth_relief_10m @earth_relief_10m_g @earth_relief_06m \
87-
@earth_relief_05m_g @earth_relief_05m @earth_relief_04m \
88-
@earth_relief_02m @earth_relief_01m
89-
gmt which -Ga @earth_day_01d @earth_day_20m
90-
gmt which -Ga @earth_night_20m
84+
exit 1
9185
displayName: Download remote data
9286
condition: ne(variables['CACHE_CACHEDATA_RESTORED'], true)
9387

ci/azure-pipelines-mac.yml

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ steps:
4141
# Cache the ${HOME}/.gmt directory, for docs and testing
4242
- task: Cache@2
4343
inputs:
44-
key: cachedata | 20200814
44+
key: cachedata | 20200820-3
4545
path: $(HOME)/.gmt
4646
cacheHitVar: CACHE_CACHEDATA_RESTORED
4747
displayName: Cache GMT remote data for testing
@@ -80,13 +80,28 @@ steps:
8080
# Download remote files, if not already cached
8181
- bash: |
8282
set -x -e
83+
# list of datasets used in tests
84+
data="@earth_relief_01d \
85+
@earth_relief_30m \
86+
@earth_relief_20m \
87+
@earth_relief_15m \
88+
@earth_relief_10m @earth_relief_10m_g \
89+
@earth_relief_06m \
90+
@earth_relief_05m @earth_relief_05m_g \
91+
@earth_relief_04m \
92+
@earth_relief_02m
93+
@earth_relief_01m \
94+
@earth_day_01d \
95+
@earth_day_20m \
96+
@earth_night_20m \
97+
@earth_age_06m \
98+
@earth_mask_05m"
99+
# Download remote data and cache files
100+
# download remote data multiple times to make sure all are downloaded
101+
gmt which -Ga $data
102+
gmt which -Ga $data
103+
gmt which -Ga $data
83104
gmt get -Dcache
84-
gmt which -Ga @earth_relief_30m @earth_relief_20m @earth_relief_15m \
85-
@earth_relief_10m @earth_relief_10m_g @earth_relief_06m \
86-
@earth_relief_05m_g @earth_relief_05m @earth_relief_04m \
87-
@earth_relief_02m @earth_relief_01m
88-
gmt which -Ga @earth_day_01d @earth_day_20m
89-
gmt which -Ga @earth_night_20m
90105
displayName: Download remote data
91106
condition: ne(variables['CACHE_CACHEDATA_RESTORED'], true)
92107

ci/azure-pipelines-windows.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ steps:
105105
# Cache the ${HOME}/.gmt directory, for docs and testing
106106
- task: Cache@2
107107
inputs:
108-
key: cachedata | 20200814
108+
key: cachedata | 20200820-3
109109
path: $(HOMEPATH)/.gmt
110110
cacheHitVar: CACHE_CACHEDATA_RESTORED
111111
displayName: Cache GMT remote data for testing
@@ -139,16 +139,10 @@ steps:
139139
gmt earthtide -T2018-06-18T12:00:00 -Gsolid_tide_up.grd
140140
displayName: Check a few simple commands
141141

142-
# Download remote files, if not already cached
142+
# Download remote files, if not already cached [Windows agents always fail]
143143
- bash: |
144144
set -x -e
145-
gmt get -Dcache
146-
gmt which -Ga @earth_relief_30m @earth_relief_20m @earth_relief_15m \
147-
@earth_relief_10m @earth_relief_10m_g @earth_relief_06m \
148-
@earth_relief_05m_g @earth_relief_05m @earth_relief_04m \
149-
@earth_relief_02m @earth_relief_01m
150-
gmt which -Ga @earth_day_01d @earth_day_20m
151-
gmt which -Ga @earth_night_20m
145+
exit 1
152146
displayName: Download remote data
153147
condition: ne(variables['CACHE_CACHEDATA_RESTORED'], true)
154148

0 commit comments

Comments
 (0)