Skip to content

Commit 6bb36f1

Browse files
mojavelinuxSteve Riesenberg
authored andcommitted
sync and refactor docs build
- add 6.0.x to release scheduler workflow - upgrade Antora to 3.2.0-alpha.2 - remove Antora patch to support linked worktrees - upgrade Antora Collector to latest alpha - remove dispatch.sh script (handled by gh run workflow) - consistently use gh run workflow to trigger workflows - remove step to publish generated docs (no longer in use)
1 parent ed657a8 commit 6bb36f1

File tree

2 files changed

+15
-23
lines changed

2 files changed

+15
-23
lines changed

.github/workflows/rebuild-search-index.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ on:
66
permissions: read-all
77
jobs:
88
build:
9-
runs-on: ubuntu-latest
109
if: github.repository_owner == 'spring-projects'
10+
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v3
1414
with:
1515
ref: docs-build
1616
fetch-depth: 1
1717
- name: Dispatch
18-
run: gh workflow run --ref $(git rev-parse --abbrev-ref HEAD) rebuild-search-index.yml
1918
env:
2019
GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
20+
run: gh workflow run rebuild-search-index.yml -r $(git rev-parse --abbrev-ref HEAD)
Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,24 @@
11
name: Release Scheduler
2-
32
on:
43
schedule:
5-
- cron: '15 15 * * MON' # Every Monday at 3:15pm UTC
4+
- cron: '15 15 * * MON' # Every Monday at 3:15pm UTC
65
workflow_dispatch:
7-
8-
permissions:
9-
contents: read
10-
6+
permissions: read-all
117
jobs:
128
dispatch_scheduled_releases:
139
name: Dispatch scheduled releases
14-
if: ${{ github.repository == 'spring-projects/spring-security' }}
10+
if: github.repository_owner == 'spring-projects'
1511
strategy:
1612
matrix:
17-
#
1813
# List of active maintenance branches.
19-
#
20-
branch:
21-
- 'main'
22-
- '5.8.x'
23-
- '5.7.x'
24-
- '5.6.x'
14+
branch: [ main, 6.0.x, 5.8.x, 5.7.x, 5.6.x ]
2515
runs-on: ubuntu-latest
26-
env:
27-
TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
2816
steps:
29-
- uses: actions/checkout@v2
30-
- uses: spring-io/spring-gradle-build-action@v1
31-
- name: Trigger release workflow
32-
run: ./gradlew dispatchGitHubWorkflow -Pbranch=${{ matrix.branch }} -PworkflowId=update-scheduled-release-version.yml -PgitHubAccessToken=$TOKEN
17+
- name: Checkout
18+
uses: actions/checkout@v3
19+
with:
20+
fetch-depth: 1
21+
- name: Dispatch
22+
env:
23+
GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
24+
run: gh workflow run update-scheduled-release-version.yml -r ${{ matrix.branch }}

0 commit comments

Comments
 (0)