Skip to content

Commit adcc187

Browse files
committed
Merge branch 'master' into user/niwilson/ebcdic-test
2 parents 3bd6eec + 804b10a commit adcc187

File tree

12 files changed

+198
-160
lines changed

12 files changed

+198
-160
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717
jobs:
1818
linux:
1919
name: Linux
20-
runs-on: ubuntu-24.04
20+
runs-on: ubuntu-latest
2121
steps:
2222
- name: Setup
2323
run: |
@@ -57,7 +57,7 @@ jobs:
5757
5858
alpine:
5959
name: alpine
60-
runs-on: ubuntu-24.04
60+
runs-on: ubuntu-latest
6161
container: alpine
6262
steps:
6363
- name: Setup
@@ -148,7 +148,7 @@ jobs:
148148
149149
freebsd:
150150
name: FreeBSD
151-
runs-on: ubuntu-24.04
151+
runs-on: ubuntu-latest
152152
if: github.event_name != 'pull_request'
153153
steps:
154154
- name: Checkout
@@ -195,7 +195,7 @@ jobs:
195195
196196
solaris:
197197
name: Solaris
198-
runs-on: ubuntu-24.04
198+
runs-on: ubuntu-latest
199199
if: github.event_name != 'pull_request'
200200
steps:
201201
- name: Checkout
@@ -274,7 +274,7 @@ jobs:
274274
275275
distcheck:
276276
name: Build & verify distribution
277-
runs-on: ubuntu-24.04 # TODO: Update to ubuntu-latest when that switches to 24.04
277+
runs-on: ubuntu-latest
278278
permissions:
279279
id-token: write # Needed to make calls to the Sigstore service
280280
attestations: write # Needed to write the attestation to GitHub's database
@@ -330,7 +330,7 @@ jobs:
330330

331331
coverage:
332332
name: Code coverage
333-
runs-on: ubuntu-24.04
333+
runs-on: ubuntu-latest
334334
steps:
335335
- name: Setup
336336
run: |

.github/workflows/cifuzz.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99

1010
jobs:
1111
Fuzzing:
12-
runs-on: ubuntu-24.04
12+
runs-on: ubuntu-latest
1313
steps:
1414
- name: Build Fuzzers
1515
id: build

.github/workflows/clang-analyzer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111

1212
jobs:
1313
Analyze:
14-
runs-on: ubuntu-24.04
14+
runs-on: ubuntu-latest
1515

1616
permissions:
1717
# Needed to upload the results to code-scanning dashboard.

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ permissions:
2626
jobs:
2727
analyze:
2828
name: Analyze
29-
runs-on: ubuntu-24.04
29+
runs-on: ubuntu-latest
3030

3131
permissions:
3232
# Needed to upload the results to code-scanning dashboard.

.github/workflows/dev.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
canary:
1919
# Tests with: Debug & assertions; link-size=4; libedit
2020
name: GCC -O0
21-
runs-on: ubuntu-24.04
21+
runs-on: ubuntu-latest
2222
steps:
2323
- name: Setup
2424
run: |
@@ -54,7 +54,7 @@ jobs:
5454
dragon:
5555
# Tests with: clang AB/UB; link-size=3
5656
name: Clang
57-
runs-on: ubuntu-24.04
57+
runs-on: ubuntu-latest
5858
strategy:
5959
fail-fast: false
6060
matrix:
@@ -143,7 +143,7 @@ jobs:
143143
wasp:
144144
# Tests with: French locale; oldest supported CMake; no JIT; -Os; libreadline
145145
name: GCC -Os, CMake+ninja, no JIT
146-
runs-on: ubuntu-24.04
146+
runs-on: ubuntu-latest
147147
env:
148148
CMAKE_VER: "3.15.7"
149149
steps:
@@ -227,7 +227,7 @@ jobs:
227227
bigbird:
228228
# Job to execute ManyConfigTests
229229
name: manyconfig
230-
runs-on: ubuntu-24.04
230+
runs-on: ubuntu-latest
231231
steps:
232232
- name: Setup
233233
run: |
@@ -247,7 +247,7 @@ jobs:
247247
camel:
248248
# Job to execute RunPerlTest
249249
name: perl
250-
runs-on: ubuntu-24.04
250+
runs-on: ubuntu-latest
251251
container: perl:devel
252252
steps:
253253
- name: Checkout
@@ -265,7 +265,7 @@ jobs:
265265
# If this fails, it's usually because two different files define some file-static
266266
# functions or macros which collide.
267267
name: CMake unity build
268-
runs-on: ubuntu-24.04
268+
runs-on: ubuntu-latest
269269
env:
270270
# Disallowing shadowing would be very spammy for unity builds, because the
271271
# same variable name can be used in multiple files.
@@ -355,7 +355,7 @@ jobs:
355355
# Not used by anyone yet, really, but potentially the "next big thing".
356356
- arch: "riscv64"
357357
distro: "ubuntu_latest"
358-
runs-on: ubuntu-24.04
358+
runs-on: ubuntu-latest
359359
permissions:
360360
contents: read
361361
packages: write # Necessary for uraimo/run-on-arch-action to use GitHub's Docker repository as a cache
@@ -396,7 +396,7 @@ jobs:
396396
zebrilus:
397397
# Tests with: Zig compiler
398398
name: Zig
399-
runs-on: ubuntu-24.04
399+
runs-on: ubuntu-latest
400400
if: github.event_name != 'pull_request'
401401
steps:
402402
- name: Setup
@@ -424,7 +424,7 @@ jobs:
424424
strategy:
425425
fail-fast: false
426426
matrix:
427-
os: ["ubuntu-24.04", "windows-latest"]
427+
os: ["ubuntu-latest", "windows-latest"]
428428
runs-on: ${{ matrix.os }}
429429
if: github.event_name != 'pull_request'
430430
steps:
@@ -444,7 +444,7 @@ jobs:
444444
# the committer's responsibility (currently) to run UpdateAlways themselves when
445445
# making a PR, so that everything is kept in-sync.
446446
name: Check autogenerated file freshness
447-
runs-on: ubuntu-24.04 # TODO: Update to ubuntu-latest when that switches to 24.04
447+
runs-on: ubuntu-latest
448448
permissions:
449449
contents: write
450450
steps:

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions: read-all
1313
jobs:
1414
analysis:
1515
name: Scorecards analysis
16-
runs-on: ubuntu-24.04
16+
runs-on: ubuntu-latest
1717

1818
permissions:
1919
# Needed to upload the results to code-scanning dashboard.

doc/html/pcre2api.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4048,7 +4048,7 @@ <h1>pcre2api man page</h1>
40484048
<b> void *<i>callout_data</i>);</b>
40494049
<br>
40504050
<br>
4051-
The <b>pcre2_set_substitution_callout()</b> function can be used to specify a
4051+
The <b>pcre2_set_substitute_callout()</b> function can be used to specify a
40524052
callout function for <b>pcre2_substitute()</b>. This information is passed in
40534053
a match context. The callout function is called after each substitution has
40544054
been processed, but it can cause the replacement not to happen.
@@ -4122,7 +4122,7 @@ <h1>pcre2api man page</h1>
41224122
<b> void *<i>callout_data</i>);</b>
41234123
<br>
41244124
<br>
4125-
The <b>pcre2_set_substitution_case_callout()</b> function can be used to specify
4125+
The <b>pcre2_set_substitute_case_callout()</b> function can be used to specify
41264126
a callout function for <b>pcre2_substitute()</b> to use when performing case
41274127
transformations. This does not affect any case insensitivity behaviour when
41284128
performing a match, but only the user-visible transformations performed when

0 commit comments

Comments
 (0)