Skip to content

Commit da3ea20

Browse files
authored
Merge branch 'main' into ogu1208/kotlin-value-class-support
2 parents 3887e63 + 856dca4 commit da3ea20

File tree

5 files changed

+24
-8
lines changed

5 files changed

+24
-8
lines changed

.github/renovate.json5

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
extends: [
44
'github>junit-team/renovate-config',
55
],
6+
baseBranchPatterns: [
7+
'main',
8+
'docs-site'
9+
],
610
packageRules: [
711
{
812
matchCurrentValue: '/^2\\./',

.github/workflows/main.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,8 @@ jobs:
105105
with:
106106
subject-path: documentation/build/attestation/*.jar
107107

108-
documentation:
108+
build_documentation:
109109
name: Build Documentation
110-
concurrency:
111-
group: github-pages-${{ github.ref }}
112-
cancel-in-progress: true
113110
needs: macOS
114111
runs-on: ubuntu-latest
115112
steps:
@@ -134,3 +131,16 @@ jobs:
134131
antora \
135132
-Pantora.downloadNode=false \
136133
-Dscan.tag.Documentation
134+
135+
deploy_documentation:
136+
name: Deploy Documentation
137+
needs: build_documentation
138+
if: github.event_name == 'push' && github.repository == 'junit-team/junit-framework' && github.ref == 'refs/heads/main'
139+
runs-on: ubuntu-latest
140+
permissions:
141+
actions: write
142+
steps:
143+
- name: Trigger documentation site deployment
144+
env:
145+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
146+
run: gh workflow run deploy-docs.yml --repo junit-team/junit-framework --ref docs-site

documentation/antora-playbook.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
antora:
22
extensions:
33
- '@antora/collector-extension'
4-
- '@antora/lunr-extension'
4+
- require: '@antora/lunr-extension'
5+
index_latest_only: true
6+
index_by_heading: true
57
- require: '@springio/antora-extensions/root-component-extension'
68
root_component_name: junit
79
- require: '@springio/antora-extensions/root-attachments-extension'

documentation/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"devDependencies": {
3-
"@antora/cli": "3.1.14",
4-
"@antora/site-generator": "3.1.14"
3+
"@antora/cli": "3.2.0-alpha.11",
4+
"@antora/site-generator": "3.2.0-alpha.11"
55
},
66
"dependencies": {
77
"@antora/collector-extension": "1.0.2",

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ant = "1.10.15"
33
apiguardian = "1.1.2"
44
assertj = "3.27.6"
55
bnd = "7.1.0"
6-
checkstyle = "12.2.0"
6+
checkstyle = "12.3.0"
77
eclipse = "4.38.0"
88
jackson = "2.20.1"
99
jacoco = "0.8.14"

0 commit comments

Comments
 (0)