diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 81f457ec..13bb8c30 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,15 +44,15 @@ jobs: with: target_branch: gh-pages build_dir: build/site - keep_history: true + keep_history: false fqdn: ${{ secrets.FQDN }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Set Redirects - id: set-redirects - if: success() && steps.branch.outputs.name == 'master' - run: bash scripts/redirect_renames.sh - env: - BOT_USER: ${{ secrets.BOT_USER }} - BOT_EMAIL: ${{ secrets.BOT_EMAIL }} - BOT_TOKEN: ${{ secrets.BOT_PAT }} + # - name: Set Redirects + # id: set-redirects + # if: success() && steps.branch.outputs.name == 'master' + # run: bash scripts/redirect_renames.sh + # env: + # BOT_USER: ${{ secrets.BOT_USER }} + # BOT_EMAIL: ${{ secrets.BOT_EMAIL }} + # BOT_TOKEN: ${{ secrets.BOT_PAT }} diff --git a/Makefile b/Makefile index c37ee713..0b295339 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,6 @@ antora.build: # antora.run: @ Serves documentation output (on port 8051) antora.run: docker-compose run --service-ports antora http-server build/site -c-1 - # antora.watch: @ Watches for documentation changes and rebuilds (to build/site) antora.watch: docker-compose run -u $$(id -u) -T antora onchange \ diff --git a/antora.dockerfile b/antora.dockerfile index 0fd3c485..a2a98adc 100644 --- a/antora.dockerfile +++ b/antora.dockerfile @@ -3,6 +3,6 @@ ENV DOCSEARCH_ENABLED=true ENV DOCSEARCH_ENGINE=lunr ENV NODE_PATH="/usr/local/lib/node_modules" ENV DOCSEARCH_INDEX_VERSION=latest -RUN yarn global add http-server onchange -RUN yarn global add antora-site-generator-lunr +RUN yarn global add http-server@13.0.2 onchange@7.1.0 +RUN yarn global add antora-site-generator-lunr@0.6.1 WORKDIR /srv/docs diff --git a/content b/content index e44ac1d7..47ed4ed7 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit e44ac1d7948365ea8613cabac6058aed07268d62 +Subproject commit 47ed4ed7bdc3ea1f662f91b008388314037c6c30 diff --git a/scripts/invalid_refs.sh b/scripts/invalid_refs.sh index ad73c802..9cc19374 100644 --- a/scripts/invalid_refs.sh +++ b/scripts/invalid_refs.sh @@ -13,7 +13,7 @@ INVALID_REFS=$( N_REFS=$(echo "${INVALID_REFS}" | wc -l | xargs) N_FILES=$(echo "${INVALID_REFS}" | cut -d ':' -f1 | uniq | wc -l | xargs) -[[ N_REFS >= 1 ]] && exit 0 +[[ ${N_REFS} -lt 1 ]] && exit 0 echo "::warning::${N_FILES} pages contain invalid references. Please check build log for details!" echo "::group::Click to show files" diff --git a/ui-customizations b/ui-customizations index cf90589f..7f731658 160000 --- a/ui-customizations +++ b/ui-customizations @@ -1 +1 @@ -Subproject commit cf90589f6020838e8a2caede2e8d822058217d18 +Subproject commit 7f73165898433fa331a6b612f56793f9331d6846