From 8dfc56411a871639c1f34957ed25221960a2dd28 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Wed, 28 Jul 2021 15:23:38 -0400 Subject: [PATCH 1/6] Enable GMT_USE_THREADS on Windows CI --- ci/config-gmt-windows.sh | 1 + ci/install-dependencies-windows.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/config-gmt-windows.sh b/ci/config-gmt-windows.sh index c7cfa3b6ae5..1d2f2f8a9e1 100755 --- a/ci/config-gmt-windows.sh +++ b/ci/config-gmt-windows.sh @@ -9,6 +9,7 @@ set (CMAKE_INSTALL_PREFIX "$ENV{INSTALLDIR}") set (GSHHG_ROOT "$ENV{COASTLINEDIR}/gshhg") set (DCW_ROOT "$ENV{COASTLINEDIR}/dcw") +set (GMT_USE_THREADS TRUE) set (GMT_ENABLE_OPENMP TRUE) EOF diff --git a/ci/install-dependencies-windows.sh b/ci/install-dependencies-windows.sh index b72c408c474..301b449aadf 100755 --- a/ci/install-dependencies-windows.sh +++ b/ci/install-dependencies-windows.sh @@ -19,7 +19,7 @@ PACKAGE="${PACKAGE:-false}" WIN_PLATFORM=x64-windows # install libraries -vcpkg install netcdf-c gdal pcre2 fftw3[core,threads] clapack openblas --triplet ${WIN_PLATFORM} +vcpkg install netcdf-c gdal pcre2 fftw3[core,threads] clapack openblas glib --triplet ${WIN_PLATFORM} # Executable files search for DLL files in the directories listed in the PATH environment variable. echo "${VCPKG_INSTALLATION_ROOT}/installed/${WIN_PLATFORM}/bin" >> $GITHUB_PATH # Tools like gdal_translate, ogr2ogr are located in tools/gdal From b661c1aa697ba9be19a0326fc305baa47fe24705 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Wed, 28 Jul 2021 15:24:02 -0400 Subject: [PATCH 2/6] Enable cache in PR --- .github/workflows/ci-caches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-caches.yml b/.github/workflows/ci-caches.yml index 772e86b8795..1df80dc5d1d 100644 --- a/.github/workflows/ci-caches.yml +++ b/.github/workflows/ci-caches.yml @@ -10,7 +10,7 @@ on: # Uncomment the "push:" line to manually re-cache data artifacts in pushes #push: # Uncomment the 'pull_request:' line to manually re-cache data artifacts in PRs - #pull_request: + pull_request: # Schedule runs on 12 noon every Sunday schedule: - cron: '0 12 * * 0' From f93eadad3301e534d26e9e20c38d4c813a0c458e Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Wed, 28 Jul 2021 17:44:30 -0400 Subject: [PATCH 3/6] Enable tests in PR --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c9c1219d43a..2b895bec2e4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,7 +4,7 @@ name: Tests on: - # pull_request: + pull_request: push: branches: - master From 4d01e73138c75cc80acc06b9cd5f87c8d2c008af Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Wed, 28 Jul 2021 22:30:06 -0400 Subject: [PATCH 4/6] Disable cache in PR --- .github/workflows/ci-caches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-caches.yml b/.github/workflows/ci-caches.yml index 1df80dc5d1d..772e86b8795 100644 --- a/.github/workflows/ci-caches.yml +++ b/.github/workflows/ci-caches.yml @@ -10,7 +10,7 @@ on: # Uncomment the "push:" line to manually re-cache data artifacts in pushes #push: # Uncomment the 'pull_request:' line to manually re-cache data artifacts in PRs - pull_request: + #pull_request: # Schedule runs on 12 noon every Sunday schedule: - cron: '0 12 * * 0' From 3e1526ef3c7776048fd152ac996f04a1ac0011b6 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Fri, 30 Jul 2021 15:58:43 -0400 Subject: [PATCH 5/6] Cache vpckg --- .github/workflows/ci-caches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-caches.yml b/.github/workflows/ci-caches.yml index 772e86b8795..1df80dc5d1d 100644 --- a/.github/workflows/ci-caches.yml +++ b/.github/workflows/ci-caches.yml @@ -10,7 +10,7 @@ on: # Uncomment the "push:" line to manually re-cache data artifacts in pushes #push: # Uncomment the 'pull_request:' line to manually re-cache data artifacts in PRs - #pull_request: + pull_request: # Schedule runs on 12 noon every Sunday schedule: - cron: '0 12 * * 0' From 82f309787c11d001ea74a7c78e05c8c213a50867 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Fri, 30 Jul 2021 18:19:55 -0400 Subject: [PATCH 6/6] Disable cache in PR --- .github/workflows/ci-caches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-caches.yml b/.github/workflows/ci-caches.yml index 1df80dc5d1d..772e86b8795 100644 --- a/.github/workflows/ci-caches.yml +++ b/.github/workflows/ci-caches.yml @@ -10,7 +10,7 @@ on: # Uncomment the "push:" line to manually re-cache data artifacts in pushes #push: # Uncomment the 'pull_request:' line to manually re-cache data artifacts in PRs - pull_request: + #pull_request: # Schedule runs on 12 noon every Sunday schedule: - cron: '0 12 * * 0'