From 94711a954c7aedf2b24f61940c22b0b826233384 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Sat, 22 Aug 2026 22:17:28 +0800 Subject: [PATCH 1/7] CI: Fix PATH to ensure GMT can find gs --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0fed49b6c3f..6f413e981fa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -138,7 +138,7 @@ jobs: - name: Check a few simple commands shell: bash run: | - export PATH="$INSTALLDIR/bin:$PATH" + export PATH="$INSTALLDIR/bin:${CONDA}/bin:$PATH" bash ci/simple-gmt-tests.sh - name: Check a few simple commands (Windows) From 638bd9273ac9d3ebbbc3e7639d54d02435d88173 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Sat, 22 Aug 2026 22:38:33 +0800 Subject: [PATCH 2/7] Check if gs exists --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f413e981fa..7e8583a3cb7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -139,6 +139,9 @@ jobs: shell: bash run: | export PATH="$INSTALLDIR/bin:${CONDA}/bin:$PATH" + test -x ${CONDA}/bin/gs + ls ${CONDA}/bin/ + which gs bash ci/simple-gmt-tests.sh - name: Check a few simple commands (Windows) From 54f47702707ae097fe81da5c3fd06dd7971579b4 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 22 Aug 2026 14:39:30 +0000 Subject: [PATCH 3/7] CI: use Homebrew ghostscript on macOS Co-authored-by: seisman <3974108+seisman@users.noreply.github.com> --- ci/install-dependencies-macos.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ci/install-dependencies-macos.sh b/ci/install-dependencies-macos.sh index cc92e9b6652..6a11ecfca75 100755 --- a/ci/install-dependencies-macos.sh +++ b/ci/install-dependencies-macos.sh @@ -17,8 +17,8 @@ PACKAGE="${PACKAGE:-false}" # packages for compiling GMT # cmake is pre-installed on GitHub Actions -packages="ninja curl pcre2 netcdf gdal geos fftw libomp" -conda_packages="ghostscript=10.03.0" +packages="ninja curl pcre2 netcdf gdal geos fftw libomp ghostscript" +conda_packages="" # packages for build documentation if [ "$BUILD_DOCS" = "true" ]; then @@ -42,8 +42,10 @@ fi brew install ${packages} # Install packages via conda -conda install ${conda_packages} -c conda-forge -echo "${CONDA}/bin" >> $GITHUB_PATH +if [ -n "${conda_packages}" ]; then + conda install ${conda_packages} -c conda-forge + echo "${CONDA}/bin" >> $GITHUB_PATH +fi # Remove pcre-config from conda's path so cmake won't find the conda's one rm -f ${CONDA}/bin/pcre-config ${CONDA}/bin/pcre2-config From 7afc929a50aa35c9ae027c2c540478f24e032c18 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 22 Aug 2026 14:40:03 +0000 Subject: [PATCH 4/7] CI: remove conda gs debug checks from build workflow Co-authored-by: seisman <3974108+seisman@users.noreply.github.com> --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7e8583a3cb7..0fed49b6c3f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -138,10 +138,7 @@ jobs: - name: Check a few simple commands shell: bash run: | - export PATH="$INSTALLDIR/bin:${CONDA}/bin:$PATH" - test -x ${CONDA}/bin/gs - ls ${CONDA}/bin/ - which gs + export PATH="$INSTALLDIR/bin:$PATH" bash ci/simple-gmt-tests.sh - name: Check a few simple commands (Windows) From 99913c2596ee5cb137eb23f8df8a401e5cde35a5 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Sat, 22 Aug 2026 22:53:59 +0800 Subject: [PATCH 5/7] Revert "CI: remove conda gs debug checks from build workflow" This reverts commit 7afc929a50aa35c9ae027c2c540478f24e032c18. --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0fed49b6c3f..7e8583a3cb7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -138,7 +138,10 @@ jobs: - name: Check a few simple commands shell: bash run: | - export PATH="$INSTALLDIR/bin:$PATH" + export PATH="$INSTALLDIR/bin:${CONDA}/bin:$PATH" + test -x ${CONDA}/bin/gs + ls ${CONDA}/bin/ + which gs bash ci/simple-gmt-tests.sh - name: Check a few simple commands (Windows) From 6dec31537266da9e7b117cfd578a9c2b4842aa04 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Sat, 22 Aug 2026 22:54:15 +0800 Subject: [PATCH 6/7] Revert "CI: use Homebrew ghostscript on macOS" This reverts commit 54f47702707ae097fe81da5c3fd06dd7971579b4. --- ci/install-dependencies-macos.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ci/install-dependencies-macos.sh b/ci/install-dependencies-macos.sh index 6a11ecfca75..cc92e9b6652 100755 --- a/ci/install-dependencies-macos.sh +++ b/ci/install-dependencies-macos.sh @@ -17,8 +17,8 @@ PACKAGE="${PACKAGE:-false}" # packages for compiling GMT # cmake is pre-installed on GitHub Actions -packages="ninja curl pcre2 netcdf gdal geos fftw libomp ghostscript" -conda_packages="" +packages="ninja curl pcre2 netcdf gdal geos fftw libomp" +conda_packages="ghostscript=10.03.0" # packages for build documentation if [ "$BUILD_DOCS" = "true" ]; then @@ -42,10 +42,8 @@ fi brew install ${packages} # Install packages via conda -if [ -n "${conda_packages}" ]; then - conda install ${conda_packages} -c conda-forge - echo "${CONDA}/bin" >> $GITHUB_PATH -fi +conda install ${conda_packages} -c conda-forge +echo "${CONDA}/bin" >> $GITHUB_PATH # Remove pcre-config from conda's path so cmake won't find the conda's one rm -f ${CONDA}/bin/pcre-config ${CONDA}/bin/pcre2-config From 7acf14494d436423f064598494e17f974ec00197 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Sat, 22 Aug 2026 23:27:31 +0800 Subject: [PATCH 7/7] Remove test -x --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7e8583a3cb7..0227b20f6a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -139,7 +139,6 @@ jobs: shell: bash run: | export PATH="$INSTALLDIR/bin:${CONDA}/bin:$PATH" - test -x ${CONDA}/bin/gs ls ${CONDA}/bin/ which gs bash ci/simple-gmt-tests.sh