Skip to content

Commit

Permalink
Use pacakge.json from 'main'
Browse files Browse the repository at this point in the history
Update the docs build to use the `package.json` file from the
`main` branch.

See gh-40072
  • Loading branch information
philwebb committed Mar 29, 2024
1 parent ec43c92 commit 669a1ee
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 3,323 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Fetch Main Branch
run: git fetch origin main:main
- name: Set Up Node
uses: actions/setup-node@v4
with:
node-version: 20
- name: Set Up NPM
run: npm ci
- name: Run Antora
- name: Install and Run Antora
env:
ALGOLIA_APP_ID: 244V8V9FGG
ALGOLIA_API_KEY: 82c7ead946afbac3cf98c32446154691
Expand All @@ -37,7 +37,7 @@ jobs:
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
REFERENCE: ${{ github.event.inputs.build-refname }}
BUILD_VERSION: ${{ github.event.inputs.build-version }}
run: npx antora antora-playbook.yml --stacktrace
run: node run.js
- name: Sync Documentation
uses: spring-io/spring-doc-actions/[email protected]
with:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
node_modules
.vscode
build
package.json
package-lock.json
7 changes: 2 additions & 5 deletions antora-playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ antora:
- require: '@springio/antora-xref-extension'
- require: '@springio/antora-zip-contents-collector-extension'
version_file: gradle.properties
username: ${env.ARTIFACTORY_USERNAME}"
password: ${env.ARTIFACTORY_PASSWORD}"
username: '${env.ARTIFACTORY_USERNAME}'
password: '${env.ARTIFACTORY_PASSWORD}'
locations:
- url: https://repo.spring.io/snapshot/org/springframework/boot/spring-boot-docs/${version}/spring-boot-docs-${version}-${name}-${classifier}.zip
for-version-type: [snapshot]
Expand Down Expand Up @@ -64,6 +64,3 @@ urls:
runtime:
log:
failure_level: warn
ui:
bundle:
url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.11/ui-bundle.zip
Loading

0 comments on commit 669a1ee

Please sign in to comment.