Skip to content

Commit 4882c37

Browse files
committed
Update main to replace 4.0.x branch
1 parent 907c180 commit 4882c37

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

.github/workflows/build-and-deploy-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_dispatch:
44
push:
55
branches:
6-
- 4.0.x
6+
- 'main'
77
concurrency:
88
group: ${{ github.workflow }}-${{ github.ref }}
99
jobs:

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI
22
on:
33
push:
44
branches:
5-
- 4.0.x
5+
- 'main'
66
jobs:
77
ci:
88
name: '${{ matrix.os.name}} | Java ${{ matrix.java.version}}'

.github/workflows/release-milestone.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: Release Milestone
22
on:
33
push:
44
tags:
5-
- v3.5.0-M[0-9]
6-
- v3.5.0-RC[0-9]
5+
- v4.0.0-M[0-9]
6+
- v4.0.0-RC[0-9]
77
concurrency:
88
group: ${{ github.workflow }}-${{ github.ref }}
99
jobs:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Release
22
on:
33
push:
44
tags:
5-
- v3.5.[0-9]+
5+
- v4.0.[0-9]+
66
concurrency:
77
group: ${{ github.workflow }}-${{ github.ref }}
88
jobs:

.github/workflows/run-system-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Run System Tests
22
on:
33
push:
44
branches:
5-
- 4.0.x
5+
- 'main'
66
jobs:
77
run-system-tests:
88
name: 'Java ${{ matrix.java.version}}'

.github/workflows/trigger-docs-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Trigger Docs Build
22
on:
33
push:
4-
branches: main
4+
branches: 'main'
55
paths: [ 'antora/*' ]
66
workflow_dispatch:
77
inputs:

git/hooks/prepare-forward-merge

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require 'net/http'
44
require 'yaml'
55
require 'logger'
66

7-
$main_branch = "3.5.x"
7+
$main_branch = "4.0.x"
88

99
$log = Logger.new(STDOUT)
1010
$log.level = Logger::WARN

0 commit comments

Comments
 (0)