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)
This commit is contained in:
Dan Allen 2022-11-21 17:49:18 -07:00 committed by Steve Riesenberg
parent ed657a8fac
commit 6bb36f1a54
No known key found for this signature in database
GPG Key ID: 5F311AB48A55D521
2 changed files with 15 additions and 23 deletions

View File

@ -6,15 +6,15 @@ on:
permissions: read-all permissions: read-all
jobs: jobs:
build: build:
runs-on: ubuntu-latest
if: github.repository_owner == 'spring-projects' if: github.repository_owner == 'spring-projects'
runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
ref: docs-build ref: docs-build
fetch-depth: 1 fetch-depth: 1
- name: Dispatch - name: Dispatch
run: gh workflow run --ref $(git rev-parse --abbrev-ref HEAD) rebuild-search-index.yml
env: env:
GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }} GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
run: gh workflow run rebuild-search-index.yml -r $(git rev-parse --abbrev-ref HEAD)

View File

@ -1,32 +1,24 @@
name: Release Scheduler name: Release Scheduler
on: on:
schedule: schedule:
- cron: '15 15 * * MON' # Every Monday at 3:15pm UTC - cron: '15 15 * * MON' # Every Monday at 3:15pm UTC
workflow_dispatch: workflow_dispatch:
permissions: read-all
permissions:
contents: read
jobs: jobs:
dispatch_scheduled_releases: dispatch_scheduled_releases:
name: Dispatch scheduled releases name: Dispatch scheduled releases
if: ${{ github.repository == 'spring-projects/spring-security' }} if: github.repository_owner == 'spring-projects'
strategy: strategy:
matrix: matrix:
#
# List of active maintenance branches. # List of active maintenance branches.
# branch: [ main, 6.0.x, 5.8.x, 5.7.x, 5.6.x ]
branch:
- 'main'
- '5.8.x'
- '5.7.x'
- '5.6.x'
runs-on: ubuntu-latest runs-on: ubuntu-latest
env:
TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
steps: steps:
- uses: actions/checkout@v2 - name: Checkout
- uses: spring-io/spring-gradle-build-action@v1 uses: actions/checkout@v3
- name: Trigger release workflow with:
run: ./gradlew dispatchGitHubWorkflow -Pbranch=${{ matrix.branch }} -PworkflowId=update-scheduled-release-version.yml -PgitHubAccessToken=$TOKEN fetch-depth: 1
- name: Dispatch
env:
GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
run: gh workflow run update-scheduled-release-version.yml -r ${{ matrix.branch }}