Skip to content

Commit

Permalink
Update Antora configuration and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
jgrandja committed Jun 21, 2024
1 parent 7c530b8 commit 0edcb75
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 28 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:
inputs:
build-refname:
description: Enter git refname to build (e.g., 5.7.x).
description: Enter git refname to build (e.g., 1.2.x).
required: false
push:
branches: docs-build
Expand All @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 5
- name: Set Up Gradle
Expand All @@ -37,14 +37,14 @@ jobs:
- name: Copy the cache to be included in the site
run: cp -rf build/antora/inject-collector-cache-config-extension/.cache build/site/
- name: Publish Docs
uses: spring-io/spring-doc-actions/[email protected].15
uses: spring-io/spring-doc-actions/[email protected].17
with:
docs-username: ${{ secrets.DOCS_USERNAME }}
docs-host: ${{ secrets.DOCS_HOST }}
docs-ssh-key: ${{ secrets.DOCS_SSH_KEY }}
docs-ssh-host-key: ${{ secrets.DOCS_SSH_HOST_KEY }}
- name: Bust Clouflare Cache
uses: spring-io/spring-doc-actions/[email protected].15
uses: spring-io/spring-doc-actions/[email protected].17
with:
context-root: spring-authorization-server
cloudflare-zone-id: ${{ secrets.CLOUDFLARE_ZONE_ID }}
Expand Down
10 changes: 2 additions & 8 deletions antora-playbook.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
antora:
extensions:
- '@springio/antora-extensions/partial-build-extension'
- require: '@springio/antora-extensions/latest-version-extension'
- require: '@springio/antora-extensions/inject-collector-cache-config-extension'
- '@antora/collector-extension'
- '@antora/atlas-extension'
- require: '@springio/antora-extensions/root-component-extension'
- require: '@springio/antora-extensions'
root_component_name: 'authorization-server'
- '@springio/antora-extensions/static-page-extension'
site:
title: Spring Authorization Server
url: https://docs.spring.io/spring-authorization-server/reference
Expand Down Expand Up @@ -37,7 +31,7 @@ urls:
redirect_facility: httpd
ui:
bundle:
url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.3/ui-bundle.zip
url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.16/ui-bundle.zip
snapshot: true
runtime:
log:
Expand Down
14 changes: 0 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,5 @@ plugins {
}

antora {
version = '3.2.0-alpha.2'
options = [clean: true, fetch: true, stacktrace: true]
environment = [
'ALGOLIA_API_KEY': '9d489079e5ec46dbb238909fee5c9c29',
'ALGOLIA_APP_ID': 'WB1FQYI187',
'ALGOLIA_INDEX_NAME': 'springdocs',
]
// NOTE remember to update the versions in lib/antora/templates/per-branch-antora-playbook.yml as well
dependencies = [
'@antora/atlas-extension': '1.0.0-alpha.1',
'@antora/collector-extension': '1.0.0-alpha.3',
'@asciidoctor/tabs': '1.0.0-beta.3',
'@springio/antora-extensions': '1.7.0',
'@springio/asciidoctor-extensions': '1.0.0-alpha.8',
]
}
2 changes: 0 additions & 2 deletions lib/antora/templates/per-branch-antora-playbook.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# PACKAGES [email protected] @antora/[email protected] @antora/[email protected] @asciidoctor/[email protected] @springio/[email protected] @springio/[email protected]
#
# The purpose of this Antora playbook is to build the docs in the current branch.
antora:
extensions:
Expand Down
10 changes: 10 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"dependencies": {
"antora": "3.2.0-alpha.4",
"@antora/atlas-extension": "1.0.0-alpha.2",
"@antora/collector-extension": "1.0.0-alpha.4",
"@asciidoctor/tabs": "1.0.0-beta.6",
"@springio/antora-extensions": "1.11.1",
"@springio/asciidoctor-extensions": "1.0.0-alpha.10"
}
}

0 comments on commit 0edcb75

Please sign in to comment.