Skip to content

Commit 9f9dea6

Browse files
authored
Merge branch 'master' into gmt-meca
2 parents b477820 + 21a81c7 commit 9f9dea6

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.github/workflows/check-links.yml

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

2828
- name: Link Checker
2929
id: lychee
30-
uses: lycheeverse/lychee-action@v2.6.1
30+
uses: lycheeverse/lychee-action@v2.7.0
3131
with:
3232
# 429: Too many requests
3333
args: >

.github/workflows/ci-caches.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
104104
# Upload the downloaded files as artifacts to GitHub
105105
- name: Upload artifacts to GitHub
106-
uses: actions/upload-artifact@v4
106+
uses: actions/upload-artifact@v5
107107
with:
108108
name: gmt-cache
109109
path: ~/.gmt/static
@@ -124,7 +124,7 @@ jobs:
124124
COASTLINEDIR: ${{ env.COASTLINEDIR }}
125125

126126
- name: Upload artifacts to GitHub
127-
uses: actions/upload-artifact@v4
127+
uses: actions/upload-artifact@v5
128128
with:
129129
name: coastline-cache
130130
path: ${{ env.COASTLINEDIR }}
@@ -141,7 +141,7 @@ jobs:
141141
run: bash ci/install-dependencies-windows.sh
142142

143143
- name: Upload artifacts to GitHub
144-
uses: actions/upload-artifact@v4
144+
uses: actions/upload-artifact@v5
145145
with:
146146
name: vcpkg-cache
147147
# VCPKG_INSTALLATION_ROOT is C:\vcpkg

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ jobs:
170170
if: runner.os == 'Windows'
171171

172172
- name: Upload build directory if failed
173-
uses: actions/upload-artifact@v4
173+
uses: actions/upload-artifact@v5
174174
with:
175175
name: BuildDirectory-${{ runner.os }}
176176
path: build/

doc/rst/source/supplements/gsfml/mlconverter.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Synopsis
1616
[ |-A| ]
1717
[ |-G|\ [**s**] ]
1818
[ |-I|\ *FZid* ]
19-
[ |-T|\ **c**\ |\ **g**\ |\ **o**\ |\ **s** ]
20-
[ GMT_V_OPT ]
19+
[ |-T|\ **c**\|\ **g**\|\ **o**\|\ **s** ]
20+
[ |SYN_OPT-V| ]
2121

2222
|No-spaces|
2323

@@ -51,7 +51,7 @@ Optional Arguments
5151

5252
.. _-T:
5353

54-
**-Tc**\ |\ **g**\ |\ **o**\ |\ **s**
54+
**-T**\ **c**\|\ **g**\|\ **o**\|\ **s**
5555
Select the magnetic time scale to use. Choose from **c** (Cande and Kent, 1995),
5656
**g** (Gee and Kent, 2007), **o** (Ogg, 2012), or **s** (Gradstein, 2004) [**g**].
5757

0 commit comments

Comments
 (0)