Skip to content

Commit 55bc272

Browse files
committed
Merge branch '2.19' into 3.x
2 parents 955897d + 29a731c commit 55bc272

4 files changed

Lines changed: 11 additions & 9 deletions

File tree

.github/workflows/cifuzz.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: CIFuzz
22
on:
33
pull_request:
4-
branches: # Only works for 2.x, due package renaming in 3.0 (master)
5-
- "2.18"
4+
branches: # Only works for 2.x, due package renaming in 3.0
5+
- "2.19"
66
permissions:
77
contents: read
88
concurrency:

.github/workflows/main.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@ name: Build and Deploy Snapshot
22
on:
33
push:
44
branches:
5-
- master
6-
- "3.0"
5+
- 3.x
76
paths-ignore:
87
- "README.md"
98
- "release-notes/*"
109
pull_request:
1110
branches:
12-
- master
13-
- "3.0"
11+
- 3.x
1412
paths-ignore:
1513
- "README.md"
1614
- "release-notes/*"
@@ -89,8 +87,8 @@ jobs:
8987
trigger-dep-builds-v3:
9088
name: Trigger downstream builds for v3
9189
needs: [build]
92-
# Only for pushes to master (v3) branch
93-
if: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
90+
# Only for pushes to 3.x branch
91+
if: ${{ github.event_name == 'push' && github.ref_name == '3.x' }}
9492
uses: ./.github/workflows/trigger_dep_builds_v3.yml
9593
secrets:
9694
token: ${{ secrets.REPO_DISPATCH }}

release-notes/VERSION

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ JSON library.
1515
=== Releases ===
1616
------------------------------------------------------------------------
1717

18+
3.0.0-rc3 (not yet released)
19+
20+
- Branch rename "master" -> "3.x" [JSTEP-12]
21+
1822
3.0.0-rc2 (28-Mar-2025)
1923

2024
No changes since 3.0.0-rc1

release-notes/VERSION-2.x

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ a pure JSON library.
1414
=== Releases ===
1515
------------------------------------------------------------------------
1616

17-
2.19.0-rc1 (07-Apr-2025)
17+
2.19.0-rc2 (07-Apr-2025)
1818

1919
#633: Allow skipping `RS` CTRL-CHAR to support JSON Text Sequences
2020
(requested by Yanming Z)

0 commit comments

Comments
 (0)