Merge branch 'master' into cache-data

GenericMappingTools · Apr 9, 2024 · db3f9c1 · db3f9c1
2 parents ae701cf + 4a8e051
commit db3f9c1
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 25 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -57,7 +57,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.6.0
+        uses: actions/checkout@v4.1.1
 
       - name: Setup vcpkg (Windows)
         uses: dawidd6/[email protected]

diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
     - name: Checkout the repository
-      uses: actions/checkout@v3.6.0
+      uses: actions/checkout@v4.1.1
 
     - name: Link Checker
       uses: lycheeverse/[email protected]

diff --git a/.github/workflows/ci-caches.yml b/.github/workflows/ci-caches.yml
@@ -111,7 +111,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.6.0
+        uses: actions/checkout@v4.1.1
 
       - name: Install vcpkg libraries
         run: bash ci/install-dependencies-windows.sh

diff --git a/.github/workflows/code-validator.yml b/.github/workflows/code-validator.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3.6.0
+        uses: actions/checkout@v4.1.1
 
       - name: Check PSL_strings.h
         run: |

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -12,6 +12,7 @@ on:
       - 'src/**'
       - 'cmake/**'
       - '**/CMakeLists.txt'
+      - '.github/workflows/docker.yml'
   pull_request:
     paths:
       - '.github/workflows/docker.yml'
@@ -62,7 +63,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.6.0
+        uses: actions/checkout@v4.1.1
 
       - name: Install GMT dependencies
         run: |
@@ -73,11 +74,14 @@ jobs:
             apt-get install -y --no-install-recommends --no-install-suggests \
                  build-essential cmake ninja-build libcurl4-gnutls-dev libnetcdf-dev \
                  ghostscript curl git \
-                libgdal-dev libfftw3-dev libpcre3-dev liblapack-dev libglib2.0-dev
+                 libgdal-dev libfftw3-dev libpcre3-dev liblapack-dev libglib2.0-dev
+            apt reinstall -y ca-certificates
+            update-ca-certificates
           elif [[ "$os" = "fedora" ]]; then
             dnf install -y cmake libcurl-devel netcdf-devel gdal-devel \
               ninja-build gdal pcre-devel fftw3-devel lapack-devel \
-              openblas-devel glib2-devel ghostscript
+              openblas-devel glib2-devel ghostscript \
+              openssl
           fi
 
       - name: Cache GSHHG and DCW data

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -56,7 +56,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.6.0
+        uses: actions/checkout@v4.1.1
 
       - name: Setup vcpkg (Windows)
         uses: dawidd6/[email protected]
@@ -152,7 +152,7 @@ jobs:
           echo "${INSTALLDIR}/bin" >> $GITHUB_PATH
 
       - name: Checkout the gh-pages branch in a separate folder
-        uses: actions/checkout@v3.6.0
+        uses: actions/checkout@v4.1.1
         with:
           ref: gh-pages
           # Checkout to this folder instead of the current one

diff --git a/.github/workflows/dvc-diff.yml b/.github/workflows/dvc-diff.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.0.0
+      uses: actions/checkout@v4.1.1
 
     - name: Setup data version control (DVC)
       uses: iterative/[email protected]

diff --git a/.github/workflows/lint-checker.yml b/.github/workflows/lint-checker.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
     - name: Check out repository
-      uses: actions/checkout@v3.6.0
+      uses: actions/checkout@v4.1.1
 
     - name: Install cppcheck
       run: |

diff --git a/.github/workflows/release-baseline-images.yml b/.github/workflows/release-baseline-images.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3.6.0
+      uses: actions/checkout@v4.1.1
 
     - name: Setup data version control (DVC)
       uses: iterative/[email protected]

diff --git a/.github/workflows/remind.yml b/.github/workflows/remind.yml
@@ -10,7 +10,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v4.1.1
 
     - name: Find and report known failures
       run: |

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -4,7 +4,7 @@
 name: Tests
 
 on:
-  # pull_request:
+  pull_request:
   push:
     branches:
       - master
@@ -56,7 +56,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.6.0
+        uses: actions/checkout@v4.1.1
 
       - name: Setup vcpkg (Windows)
         uses: dawidd6/[email protected]

diff --git a/src/gmt_common_sighandler.c b/src/gmt_common_sighandler.c
@@ -111,6 +111,8 @@ GMT_LOCAL void backtrace_symbols_fd(void *const *buffer, int size, int fd) {
 #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.arm_pc)
 # elif defined( __hppa__)
 #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.sc_iaoq[0])
+# elif defined( __loongarch__)
+#  define UC_IP(uc) ((void *) (uc)->uc_mcontext.__pc)
 # elif defined(__m68k__)
 #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.gregs[R_PC])
 # elif defined(__riscv)

diff --git a/test/gmtest.in b/test/gmtest.in
@@ -32,8 +32,8 @@ if [ $skip_this_test -gt 0 ]; then	# Do not run this script, probably PS is too
 		exit 0
 fi
 
-# Is it a modern mode or one-liner script
-modern=$(grep "gmt begin\| -ps " "$script" -c)
+# Is it a modern mode ('gmt begin figname') or one-liner script ('-ps').
+modern=$(grep "gmt begin .*\| -ps " "$script" -c)
 
 # Is it a script that is known to fail?
 if [ "@GMT_ENABLE_KNOWN2FAIL@" = "ON" ]; then

diff --git a/test/grdimage/transp_mix.sh b/test/grdimage/transp_mix.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 #
 # Testing gmt grdmix on adding A to RGB image and plot via grdimage
+#
+# GMT_KNOWN_FAILURE
 
 gmt begin transp_mix ps
 	gmt set MAP_GRID_PEN 2p FONT_TAG 9p PS_MEDIA letter PS_PAGE_ORIENTATION portrait

diff --git a/test/psevents/event_lines.sh b/test/psevents/event_lines.sh
@@ -7,14 +7,14 @@ gmt psevents -/qq
 mv -f psevents_function.txt psevents_function_q.txt
 gmt psevents -/cc
 mv -f psevents_function.txt psevents_function_c.txt
-cat << EOF > /tmp/labels
+cat << EOF > labels.txt
 -0.5	2.4	RISE
 0.5	2.4	PLATEAU
 1.5	2.4	DECAY
 2.5	2.4	NORMAL
 3.5	2.4	FADE
 EOF
-cat << EOF > /tmp/def
+cat << EOF > def.txt
 -2	0
 0	0
 0	1
@@ -29,21 +29,23 @@ gmt begin event_lines ps
 	gmt plot psevents_function_l.txt -W2p,green -i0,2 -lintens
 	gmt plot psevents_function_l.txt -W1p,blue  -i0,3+d100 -ltransp
 	gmt plot psevents_function_l.txt -W0.25p,orange -i0,4 -ldz
-	gmt text /tmp/labels -F+f9p+jTC
-	gmt plot /tmp/def -W1p,3_2:0 -ldefault
+	gmt text labels.txt -F+f9p+jTC
+	gmt plot def.txt -W1p,3_2:0 -ldefault
 	gmt subplot set 1 -AQuadratic
 	gmt plot psevents_function_q.txt -W3p,red -i0,1 -lsize
 	gmt plot psevents_function_q.txt -W2p,green -i0,2 -lintens
 	gmt plot psevents_function_q.txt -W1p,blue  -i0,3+d100 -ltransp
 	gmt plot psevents_function_q.txt -W0.25p,orange -i0,4 -ldz
-	gmt text /tmp/labels -F+f9p+jTC
-	gmt plot /tmp/def -W1p,3_2:0 -ldefault
+	gmt text labels.txt -F+f9p+jTC
+	gmt plot def.txt -W1p,3_2:0 -ldefault
 	gmt subplot set 2 -ACosine
 	gmt plot psevents_function_c.txt -W3p,red -i0,1 -lsize
 	gmt plot psevents_function_c.txt -W2p,green -i0,2 -lintens
 	gmt plot psevents_function_c.txt -W1p,blue  -i0,3+d100 -ltransp
 	gmt plot psevents_function_c.txt -W0.25p,orange -i0,4 -ldz
-	gmt text /tmp/labels -F+f9p+jTC
-	gmt plot /tmp/def -W1p,3_2:0 -ldefault
+	gmt text labels.txt -F+f9p+jTC
+	gmt plot def.txt -W1p,3_2:0 -ldefault
 	gmt subplot end
 gmt end show
+
+rm -f labels.txt def.txt