Skip to content

Commit 8bc55d5

Browse files
yvonnefroehlichyvonnefroehlich
authored
Merge branch 'main' into add-gallery-grdmask
2 parents 904b0fe + 3a72b63 commit 8bc55d5

31 files changed

Lines changed: 118 additions & 63 deletions

‎.github/workflows/benchmarks.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
steps:
3737
# Checkout current git repository
3838
- name: Checkout
39-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
39+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
4040
with:
4141
# fetch all history so that setuptools-scm works
4242
fetch-depth: 0
@@ -84,7 +84,7 @@ jobs:
8484

8585
# Run the benchmark tests
8686
- name: Run benchmarks
87-
uses: CodSpeedHQ/action@3194d9a39c4d46684cb44bf7207fc56626aad8fd # v4.15.1
87+
uses: CodSpeedHQ/action@9d332c4d90b43981c3e55ae8e38e68709996240f # v4.17.0
8888
with:
8989
mode: "instrumentation"
9090
# 'bash -el -c' is needed to use the custom shell.

‎.github/workflows/cache_data.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
steps:
4343
# Checkout current git repository
4444
- name: Checkout
45-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
45+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
4646
with:
4747
# fetch all history so that setuptools-scm works
4848
fetch-depth: 0

‎.github/workflows/cache_dvc.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
steps:
3838
- name: Checkout
39-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
39+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
4040
with:
4141
# fetch all history so that setuptools-scm works
4242
fetch-depth: 0

‎.github/workflows/check-links.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ jobs:
2626

2727
steps:
2828
- name: Checkout the repository
29-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
29+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3030
with:
3131
path: repository
3232
persist-credentials: false
3333

3434
- name: Checkout the documentation
35-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
35+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3636
with:
3737
ref: gh-pages
3838
path: documentation

‎.github/workflows/ci_docs.yml‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ jobs:
5353
strategy:
5454
fail-fast: false
5555
matrix:
56-
os: [ubuntu-latest, macos-latest]
57-
# os: [ubuntu-latest, macos-latest, windows-latest]
56+
os: [ubuntu-latest, macos-latest, windows-latest]
5857
# Is it a draft Pull Request (true or false)?
5958
isDraft:
6059
- ${{ github.event.pull_request.draft }}
@@ -72,7 +71,7 @@ jobs:
7271
steps:
7372
# Checkout current git repository
7473
- name: Checkout
75-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
74+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
7675
with:
7776
# fetch all history so that setuptools-scm works
7877
fetch-depth: 0
@@ -136,10 +135,25 @@ jobs:
136135
python -m pip install dist/*
137136
138137
- name: Build the HTML documentation
139-
run: make -C doc clean html
138+
run: |
139+
log_file="${RUNNER_TEMP}/sphinx-html.log"
140+
make -C doc clean html 2>&1 | tee "${log_file}"
141+
exit_code=${PIPESTATUS[0]}
142+
if [[ "${RUNNER_OS}" == "Windows" && "${exit_code}" -eq 2 ]] && grep -q "make: .* Error 2816" "${log_file}"; then
143+
echo "Sphinx HTML build exited with make error 2816 (segmentation fault) on Windows; allowing workflow to continue."
144+
exit 0
145+
fi
146+
exit "${exit_code}"
140147
141148
- name: Build the PDF documentation
142-
run: make -C doc pdf
149+
run: |
150+
log_file="${RUNNER_TEMP}/sphinx-pdf.log"
151+
make -C doc pdf 2>&1 | tee "${log_file}"
152+
exit_code=${PIPESTATUS[0]}
153+
if [[ "${RUNNER_OS}" == "Windows" && "${exit_code}" -eq 2 ]] && grep -q "make: .* Error 2816" "${log_file}"; then
154+
echo "Sphinx PDF build exited with make error 2816 (segmentation fault) on Windows; allowing workflow to continue."
155+
exit 0
156+
fi
143157
144158
- name: Create the HTML ZIP archive and rename the PDF file
145159
run: |
@@ -168,7 +182,7 @@ jobs:
168182
REF_NAME: ${{ github.ref_name }}
169183

170184
- name: Checkout the gh-pages branch
171-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
185+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
172186
with:
173187
ref: gh-pages
174188
# Checkout to this folder instead of the current one

‎.github/workflows/ci_doctests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
steps:
3838
# Checkout current git repository
3939
- name: Checkout
40-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
40+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
4141
with:
4242
# fetch all history so that setuptools-scm works
4343
fetch-depth: 0

‎.github/workflows/ci_tests.yaml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
steps:
108108
# Checkout current git repository
109109
- name: Checkout
110-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
110+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
111111
with:
112112
# fetch all history so that setuptools-scm works
113113
fetch-depth: 0
@@ -189,7 +189,15 @@ jobs:
189189

190190
# Run the regular tests
191191
- name: Run tests
192-
run: make test PYTEST_EXTRA="-r P --reruns 2"
192+
run: |
193+
log_file="${RUNNER_TEMP}/pytest.log"
194+
make test PYTEST_EXTRA="-r P --reruns 2" 2>&1 | tee "${log_file}"
195+
exit_code=${PIPESTATUS[0]}
196+
if [[ "${RUNNER_OS}" == "Windows" && "${exit_code}" -eq 2 ]] && grep -q "make: .* Error 2816" "${log_file}"; then
197+
echo "Tests exited with make error 2816 (segmentation fault) on Windows; allowing workflow to continue."
198+
exit 0
199+
fi
200+
exit "${exit_code}"
193201
194202
# Upload diff images on test failure
195203
- name: Upload diff images if any test fails
@@ -201,7 +209,7 @@ jobs:
201209

202210
# Upload coverage to Codecov
203211
- name: Upload coverage to Codecov
204-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
212+
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
205213
if: success() || failure()
206214
with:
207215
use_oidc: true

‎.github/workflows/ci_tests_dev.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
steps:
5050
# Checkout current git repository
5151
- name: Checkout
52-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
52+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
5353
with:
5454
# fetch all history so that setuptools-scm works
5555
fetch-depth: 0
@@ -95,7 +95,7 @@ jobs:
9595

9696
# Checkout current GMT repository
9797
- name: Checkout the GMT source from ${{ matrix.gmt_git_ref }} branch
98-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
98+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
9999
with:
100100
repository: 'GenericMappingTools/gmt'
101101
ref: ${{ matrix.gmt_git_ref }}

‎.github/workflows/ci_tests_legacy.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
steps:
4747
# Checkout current git repository
4848
- name: Checkout
49-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
49+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
5050
with:
5151
# fetch all history so that setuptools-scm works
5252
fetch-depth: 0

‎.github/workflows/dvc-diff.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
29+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3030
with:
3131
# fetch all history so that dvc diff works
3232
fetch-depth: 0

0 commit comments

Comments
 (0)