diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 4b03c87d01..f3e899c4fe 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -13,7 +13,7 @@ permissions: jobs: build: runs-on: ubuntu-latest - # if: github.repository_owner == 'spring-projects' + if: github.repository_owner == 'spring-projects' steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.gitignore b/.gitignore index 696c333f41..211080d88a 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,5 @@ atlassian-ide-plugin.xml # VS Code .vscode/ + +cached-antora-playbook.yml diff --git a/framework-docs/antora-playbook.yml b/framework-docs/antora-playbook.yml deleted file mode 100644 index 6e9e4308e6..0000000000 --- a/framework-docs/antora-playbook.yml +++ /dev/null @@ -1,35 +0,0 @@ -# PACKAGES antora@3.2.0-alpha.2 @antora/atlas-extension:1.0.0-alpha.1 @antora/collector-extension@1.0.0-alpha.3 @springio/antora-extensions@1.1.0-alpha.2 @asciidoctor/tabs@1.0.0-alpha.12 @opendevise/antora-release-line-extension@1.0.0-alpha.2 -# -# The purpose of this Antora playbook is to build the docs in the current branch. -antora: - extensions: - - '@antora/collector-extension' -site: - title: Spring Framework Reference - url: https://https://rwinch.github.io/spring-framework/ -content: - sources: - - url: ../. - branches: HEAD - start_path: framework-docs - worktrees: true -asciidoc: - attributes: - page-pagination: '' - hide-uri-scheme: '@' - tabs-sync-option: '@' - chomp: 'all' - extensions: - - '@asciidoctor/tabs' - - '@springio/asciidoctor-extensions' - - '@springio/asciidoctor-extensions/include-code-extension' - sourcemap: true -urls: - latest_version_segment: '' -runtime: - log: - failure_level: warn -ui: - bundle: - url: https://github.com/spring-io/antora-ui-spring/releases/download/latest/ui-bundle.zip - snapshot: true \ No newline at end of file diff --git a/framework-docs/framework-docs.gradle b/framework-docs/framework-docs.gradle index 59c29569a4..dcf2f7c22c 100644 --- a/framework-docs/framework-docs.gradle +++ b/framework-docs/framework-docs.gradle @@ -11,13 +11,13 @@ apply from: "${rootDir}/gradle/publications.gradle" antora { version = '3.2.0-alpha.2' - playbook = 'antora-playbook.yml' -// playbookProvider { -// repository = 'rwinch/spring-framework' -// branch = 'docs-build' -// path = 'lib/antora/templates/per-branch-antora-playbook.yml' -// checkLocalBranch = true -// } + playbook = 'cached-antora-playbook.yml' + playbookProvider { + repository = 'rwinch/spring-framework' + branch = 'docs-build' + path = 'lib/antora/templates/per-branch-antora-playbook.yml' + checkLocalBranch = true + } options = ['--clean', '--stacktrace'] environment = [ 'ALGOLIA_API_KEY': '82c7ead946afbac3cf98c32446154691', @@ -29,7 +29,7 @@ antora { '@antora/collector-extension': '1.0.0-alpha.3', '@asciidoctor/tabs': '1.0.0-beta.3', '@opendevise/antora-release-line-extension': '1.0.0-alpha.2', - '@springio/antora-extensions': '1.1.0', + '@springio/antora-extensions': '1.3.0', '@springio/asciidoctor-extensions': '1.0.0-alpha.9' ] }