From c9d7df92a9a39a6c558cb4ed33e49e897abfe763 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Mon, 21 Aug 2023 18:46:25 +0800 Subject: [PATCH 1/3] Store the CN localization file in the ~/.gmt/localization directory --- .github/workflows/deploy.yml | 3 --- .github/workflows/preview-pr.yml | 3 --- scripts/setup-ci.sh | 5 ++++- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 415cb9ac7f..5085ac7c7e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -70,9 +70,6 @@ jobs: gmt text -L cat ~/.gmt/cidfmap cat ~/.gmt/PSL_custom_fonts.txt - cd $(gmt --show-sharedir)/localization - cp gmt_cn1.locale gmt_cn1.locale_old - iconv -f GBK -t UTF-8 gmt_cn1.locale_old > gmt_cn1.locale - name: Build HTML run: make build_html diff --git a/.github/workflows/preview-pr.yml b/.github/workflows/preview-pr.yml index 3b64cd3bd8..1169ad59b1 100644 --- a/.github/workflows/preview-pr.yml +++ b/.github/workflows/preview-pr.yml @@ -61,9 +61,6 @@ jobs: gmt text -L cat ~/.gmt/cidfmap cat ~/.gmt/PSL_custom_fonts.txt - cd $(gmt --show-sharedir)/localization - cp gmt_cn1.locale gmt_cn1.locale_old - iconv -f GBK -t UTF-8 gmt_cn1.locale_old > gmt_cn1.locale - name: Build HTML run: make build_html diff --git a/scripts/setup-ci.sh b/scripts/setup-ci.sh index 94e8d3b034..3def1b74cc 100755 --- a/scripts/setup-ci.sh +++ b/scripts/setup-ci.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # # Download some datasets and make changes for CI. -# +# # Create the .gmt folder mkdir ~/.gmt @@ -74,3 +74,6 @@ STHeiti-Regular--UniGB-UTF8-V 0.700 1 STKaiti-Regular--UniGB-UTF8-V 0.700 1 EOF +# Fix the gmt_cn1.locale file +mkdir -p ~/.gmt/localization +iconv -f GBK -t UTF-8 $(gmt --show-sharedir)/localization/gmt_cn1.locale > ~/.gmt/localization/gmt_cn1.locale From 324b5f8837fa99100d3d55c7591618a84be84be3 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Mon, 21 Aug 2023 18:46:48 +0800 Subject: [PATCH 2/3] Temporarily enable the workflow in PR --- .github/workflows/cache-data.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cache-data.yml b/.github/workflows/cache-data.yml index 8d6d0cd92e..78cfa9755a 100644 --- a/.github/workflows/cache-data.yml +++ b/.github/workflows/cache-data.yml @@ -3,7 +3,7 @@ name: Cache data on: # Uncomment the 'pull_request' line below to manually re-cache data artifacts - # pull_request: + pull_request: # Schedule runs on 12 noon every Sunday schedule: - cron: '0 12 * * 0' From f6d823e8bfa5ebd3c12dd4951fc527b4e17065f5 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Mon, 21 Aug 2023 19:00:39 +0800 Subject: [PATCH 3/3] Update .github/workflows/cache-data.yml --- .github/workflows/cache-data.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cache-data.yml b/.github/workflows/cache-data.yml index 78cfa9755a..8d6d0cd92e 100644 --- a/.github/workflows/cache-data.yml +++ b/.github/workflows/cache-data.yml @@ -3,7 +3,7 @@ name: Cache data on: # Uncomment the 'pull_request' line below to manually re-cache data artifacts - pull_request: + # pull_request: # Schedule runs on 12 noon every Sunday schedule: - cron: '0 12 * * 0'