From c9e91adfa287ba399f2c6444c02785c7b6e22f94 Mon Sep 17 00:00:00 2001 From: Christian Tzolov Date: Mon, 21 Oct 2024 11:02:51 +0200 Subject: [PATCH] streamline configuration --- .github/workflows/deploy-docs.yml | 22 +++++++++++----------- antora-playbook.yml | 8 +------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 1c9a3f16c..6b712fd0e 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -26,19 +26,19 @@ jobs: with: java-version: '17' distribution: 'temurin' - - name: Set up refname build - if: github.event.inputs.build-refname - run: | - git fetch --depth 1 https://github.com/$GITHUB_REPOSITORY ${{ github.event.inputs.build-refname }} - export BUILD_REFNAME=${{ github.event.inputs.build-refname }} - echo "BUILD_REFNAME=$BUILD_REFNAME" >> $GITHUB_ENV - export BUILD_VERSION=$(git cat-file --textconv FETCH_HEAD:pom.xml | python3 -c "import xml.etree.ElementTree as xml; from sys import stdin; print(xml.parse(stdin).getroot().find('{http://maven.apache.org/POM/4.0.0}version').text)") - echo BUILD_VERSION=$BUILD_VERSION >> $GITHUB_ENV + # - name: Set up refname build + # if: github.event.inputs.build-refname + # run: | + # git fetch --depth 1 https://github.com/$GITHUB_REPOSITORY ${{ github.event.inputs.build-refname }} + # export BUILD_REFNAME=${{ github.event.inputs.build-refname }} + # echo "BUILD_REFNAME=$BUILD_REFNAME" >> $GITHUB_ENV + # export BUILD_VERSION=$(git cat-file --textconv FETCH_HEAD:pom.xml | python3 -c "import xml.etree.ElementTree as xml; from sys import stdin; print(xml.parse(stdin).getroot().find('{http://maven.apache.org/POM/4.0.0}version').text)") + # echo BUILD_VERSION=$BUILD_VERSION >> $GITHUB_ENV - name: Run Antora run: | ./mvnw antora - name: Publish Docs - uses: spring-io/spring-doc-actions/rsync-antora-reference@v0.0.11 + uses: spring-io/spring-doc-actions/rsync-antora-reference@v0.0.18 with: docs-username: ${{ secrets.DOCS_USERNAME }} docs-host: ${{ secrets.DOCS_HOST }} @@ -46,8 +46,8 @@ jobs: docs-ssh-host-key: ${{ secrets.DOCS_SSH_HOST_KEY }} site-path: target/antora/site # - name: Bust Cloudflare Cache - # uses: spring-io/spring-doc-actions/bust-cloudflare-antora-cache@v0.0.11 + # uses: spring-io/spring-doc-actions/bust-cloudflare-antora-cache@v0.0.18 # with: # context-root: spring-ai # cloudflare-zone-id: ${{ secrets.CLOUDFLARE_ZONE_ID }} - # cloudflare-cache-token: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }} + # cloudflare-cache-token: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }} \ No newline at end of file diff --git a/antora-playbook.yml b/antora-playbook.yml index 54bbe6cc9..f1d690604 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -1,12 +1,6 @@ antora: extensions: - - '@antora/collector-extension' - - '@antora/atlas-extension' - - '@springio/antora-extensions/set-algolia-env-extension' - - '@springio/antora-extensions/partial-build-extension' - - require: '@springio/antora-extensions/latest-version-extension' - - require: '@springio/antora-extensions/inject-collector-cache-config-extension' - - require: '@springio/antora-extensions/root-component-extension' + - require: '@springio/antora-extensions' root_component_name: 'ai' site: title: Spring AI Reference