Skip to content

Commit 2423034

Browse files
committed
Use pacakge.json from 'main'
Update the docs build to use the `package.json` file from the `main` branch. See gh-40072
1 parent ec43c92 commit 2423034

File tree

6 files changed

+56
-3323
lines changed

6 files changed

+56
-3323
lines changed

.github/workflows/deploy-docs.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ jobs:
2626
uses: actions/setup-node@v4
2727
with:
2828
node-version: 20
29-
- name: Set Up NPM
30-
run: npm ci
31-
- name: Run Antora
29+
- name: Install and Run Antora
3230
env:
3331
ALGOLIA_APP_ID: 244V8V9FGG
3432
ALGOLIA_API_KEY: 82c7ead946afbac3cf98c32446154691
@@ -37,7 +35,7 @@ jobs:
3735
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
3836
REFERENCE: ${{ github.event.inputs.build-refname }}
3937
BUILD_VERSION: ${{ github.event.inputs.build-version }}
40-
run: npx antora antora-playbook.yml --stacktrace
38+
run: node run.js
4139
- name: Sync Documentation
4240
uses: spring-io/spring-doc-actions/[email protected]
4341
with:

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
node_modules
22
.vscode
33
build
4+
package.json
5+
package-lock.json

antora-playbook.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ antora:
88
- require: '@springio/antora-xref-extension'
99
- require: '@springio/antora-zip-contents-collector-extension'
1010
version_file: gradle.properties
11-
username: ${env.ARTIFACTORY_USERNAME}"
12-
password: ${env.ARTIFACTORY_PASSWORD}"
11+
username: '${env.ARTIFACTORY_USERNAME}'
12+
password: '${env.ARTIFACTORY_PASSWORD}'
1313
locations:
1414
- url: https://repo.spring.io/snapshot/org/springframework/boot/spring-boot-docs/${version}/spring-boot-docs-${version}-${name}-${classifier}.zip
1515
for-version-type: [snapshot]
@@ -64,6 +64,3 @@ urls:
6464
runtime:
6565
log:
6666
failure_level: warn
67-
ui:
68-
bundle:
69-
url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.11/ui-bundle.zip

0 commit comments

Comments
 (0)