Skip to content

Commit 3ff5302

Browse files
committed
Merge branch 'main' into fix/version_dropdown
2 parents 74a2805 + 67ed82f commit 3ff5302

File tree

6 files changed

+215
-224
lines changed

6 files changed

+215
-224
lines changed

.github/actions/bootstrap/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ runs:
3838
echo "full-version=${REPO_VERSION}" >> $GITHUB_OUTPUT
3939
echo "major-version=$(echo ${REPO_VERSION} | cut -d"." -f1)" >> $GITHUB_OUTPUT
4040
41-
- uses: actions/setup-node@v5
41+
- uses: actions/setup-node@v6
4242
with:
4343
cache: npm
4444
cache-dependency-path: src/Elastic.Documentation.Site/package-lock.json

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
steps:
7878
- uses: actions/checkout@v5
7979

80-
- uses: actions/setup-node@v5
80+
- uses: actions/setup-node@v6
8181
with:
8282
cache: npm
8383
cache-dependency-path: src/Elastic.Documentation.Site/package-lock.json

.github/workflows/preview-build.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,10 @@ jobs:
452452
&& (steps.docs-build.outputs.skip != 'true' || steps.internal-docs-build.outputs.skip != 'true')
453453
&& steps.deployment.outputs.result
454454
&& (steps.docs-build.outcome == 'success' || steps.internal-docs-build.outcome == 'success')
455+
env:
456+
# https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-retries.html#cli-usage-retries-configure
457+
AWS_RETRY_MODE: standard
458+
AWS_MAX_ATTEMPTS: 6
455459
run: |
456460
aws s3 sync .artifacts/docs/html "s3://elastic-docs-v3-website-preview${PATH_PREFIX}" --delete --no-follow-symlinks
457461
aws cloudfront create-invalidation \

config/navigation.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -590,10 +590,10 @@ toc:
590590
path_prefix: reference/ecs/logging/ruby
591591
# Children include the entire AsciiDoc book
592592

593-
# Data analysis
594-
# https://github.com/elastic/docs-content/blob/main/reference/data-analysis/toc.yml
595-
- toc: docs-content://reference/data-analysis
596-
path_prefix: reference/data-analysis
593+
# Machine learning (FKA Data analysis)
594+
# https://github.com/elastic/docs-content/blob/main/reference/machine-learning/toc.yml
595+
- toc: docs-content://reference/machine-learning
596+
path_prefix: reference/machine-learning
597597

598598
# Search UI
599599
# https://github.com/elastic/search-ui/blob/main/docs/reference/toc.yml

0 commit comments

Comments
 (0)