Skip to content

Commit ed803e2

Browse files
authored
Merge branch 'main' into feature/extensionless-urls
2 parents f6f17c6 + d6bfa89 commit ed803e2

39 files changed

+283
-86
lines changed

.github/release-drafter.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ categories:
2929
labels:
3030
- 'automation' # When automation is updated
3131
- 'ci' # When automation is updated
32+
- title: '🎨 Redesign' # Temporary category while we're redesigning the docs
33+
labels:
34+
- 'redesign' # When it's a redesign feature
3235
exclude-labels:
3336
- 'changelog:skip' # When a PR should be excluded from the changelog
3437
version-resolver:

.github/workflows/comment-on-asciidoc-changes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
owner: context.repo.owner,
3737
repo: context.repo.repo,
3838
issue_number: context.payload.pull_request.number,
39-
body: 'It looks like this PR modifies one or more `.asciidoc` files. These files are being migrated to Markdown, and any changes merged now will be lost. See the [migration guide](https://elastic.github.io/docs-builder/migration/freeze/index.html) for details.'
39+
body: '> [!WARNING]\n> It looks like this PR modifies one or more `.asciidoc` files. These files are being migrated to Markdown, and any changes merged now will be lost. See the [migration guide](https://elastic.github.io/docs-builder/migration/freeze/index.html) for details.'
4040
})
4141
4242
- name: Error if .asciidoc files changed

.github/workflows/preview-build.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
name: preview-build
22

33
on:
4-
pull_request: ~
4+
pull_request:
5+
types:
6+
- opened
7+
- synchronize
8+
- reopened
9+
- labeled
10+
- unlabeled
511
workflow_call:
612
inputs:
713
strict:
@@ -25,6 +31,9 @@ permissions:
2531

2632
jobs:
2733
build:
34+
concurrency:
35+
group: ${{ github.workflow }}-${{ github.ref }}
36+
cancel-in-progress: true
2837
runs-on: ubuntu-latest
2938
steps:
3039

@@ -66,6 +75,10 @@ jobs:
6675
- name: Bootstrap Action Workspace
6776
if: github.repository == 'elastic/docs-builder' && steps.check-files.outputs.any_changed == 'true'
6877
uses: ./.github/actions/bootstrap
78+
79+
- name: Set REDESIGN feature flag
80+
if: contains(github.event.pull_request.labels.*.name, 'redesign')
81+
run: echo "REDESIGN=true" >> $GITHUB_ENV
6982

7083
# we run our artifact directly please use the prebuild
7184
# elastic/docs-builder@main GitHub Action for all other repositories!

.github/workflows/preview-deploy.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ jobs:
8989
PR_NUMBER: ${{ needs.pull-request-data.outputs.number }}
9090
run: |
9191
aws s3 sync ./html "s3://elastic-docs-v3-website-preview/${GITHUB_REPOSITORY}/pull/${PR_NUMBER}" --delete
92-
aws cloudfront create-invalidation --distribution-id EKT7LT5PM8RKS --paths "/${GITHUB_REPOSITORY}/pull/${PR_NUMBER}/*"
92+
aws cloudfront create-invalidation \
93+
--distribution-id EKT7LT5PM8RKS \
94+
--paths "/${GITHUB_REPOSITORY}/pull/${PR_NUMBER}" "/${GITHUB_REPOSITORY}/pull/${PR_NUMBER}/*"
9395
9496
- name: Update deployment status
9597
uses: actions/github-script@v7

docs/syntax/applies.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ Are equivalent, note `all` just means we won't be rendering the version portion
5252
## This section has its own applies annotations [#sections]
5353

5454
:::{applies}
55-
:stack: unavailable
56-
:serverless: tech-preview
57-
:cloud: ga
55+
:serverless: unavailable
5856
:::
5957

6058
:::{note}

docs/syntax/substitutions.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ subs:
2424
If a substitution is defined globally it may not be redefined (shaded) in a files `frontmatter`.
2525
Doing so will result in a build error.
2626

27+
To use the variables in your files, surround them in curly brackets (`{{variable}}`).
28+
2729
## Example
2830

2931
Here are some variable substitutions:

src/Elastic.Markdown/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ _static/main.js
44
_static/main.js.map
55
_static/styles.css
66
_static/styles.css.map
7+
_static/*.woff2
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
@import url('https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap');
2+
3+
4+
@font-face {
5+
font-family: "Mier B";
6+
src: url("./fonts/MierB-Regular.woff2") format("woff2")
7+
}
48.6 KB
Binary file not shown.
File renamed without changes.

0 commit comments

Comments
 (0)