Browse Source

Update main to replace 4.0.x branch

pull/46198/head
Andy Wilkinson 7 months ago
parent
commit
4882c3707b
  1. 2
      .github/workflows/build-and-deploy-snapshot.yml
  2. 2
      .github/workflows/ci.yml
  3. 4
      .github/workflows/release-milestone.yml
  4. 2
      .github/workflows/release.yml
  5. 2
      .github/workflows/run-system-tests.yml
  6. 2
      .github/workflows/trigger-docs-build.yml
  7. 2
      git/hooks/prepare-forward-merge

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

@ -3,7 +3,7 @@ on: @@ -3,7 +3,7 @@ on:
workflow_dispatch:
push:
branches:
- 4.0.x
- 'main'
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
jobs:

2
.github/workflows/ci.yml

@ -2,7 +2,7 @@ name: CI @@ -2,7 +2,7 @@ name: CI
on:
push:
branches:
- 4.0.x
- 'main'
jobs:
ci:
name: '${{ matrix.os.name}} | Java ${{ matrix.java.version}}'

4
.github/workflows/release-milestone.yml

@ -2,8 +2,8 @@ name: Release Milestone @@ -2,8 +2,8 @@ name: Release Milestone
on:
push:
tags:
- v3.5.0-M[0-9]
- v3.5.0-RC[0-9]
- v4.0.0-M[0-9]
- v4.0.0-RC[0-9]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
jobs:

2
.github/workflows/release.yml

@ -2,7 +2,7 @@ name: Release @@ -2,7 +2,7 @@ name: Release
on:
push:
tags:
- v3.5.[0-9]+
- v4.0.[0-9]+
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
jobs:

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

@ -2,7 +2,7 @@ name: Run System Tests @@ -2,7 +2,7 @@ name: Run System Tests
on:
push:
branches:
- 4.0.x
- 'main'
jobs:
run-system-tests:
name: 'Java ${{ matrix.java.version}}'

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

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
name: Trigger Docs Build
on:
push:
branches: main
branches: 'main'
paths: [ 'antora/*' ]
workflow_dispatch:
inputs:

2
git/hooks/prepare-forward-merge

@ -4,7 +4,7 @@ require 'net/http' @@ -4,7 +4,7 @@ require 'net/http'
require 'yaml'
require 'logger'
$main_branch = "3.5.x"
$main_branch = "4.0.x"
$log = Logger.new(STDOUT)
$log.level = Logger::WARN

Loading…
Cancel
Save