Update main to replace 4.0.x branch

This commit is contained in:
Andy Wilkinson 2025-06-20 09:18:05 +01:00
parent 907c180842
commit 4882c3707b
7 changed files with 8 additions and 8 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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