Skip to content

Commit 3182442

Browse files
authored
Merge branch 'main' into crosslinks-in-toc-take-three
2 parents 2a3a20a + ebab77e commit 3182442

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+2024
-1462
lines changed

.github/workflows/build-api-lambda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
env:
2222
BINARY_PATH: .artifacts/Elastic.Documentation.Api.Lambda/release_linux-x64/bootstrap
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525
with:
2626
ref: ${{ inputs.ref }}
2727
- name: Amazon Linux 2023 build

.github/workflows/build-link-index-updater-lambda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
env:
1919
BINARY_PATH: .artifacts/docs-lambda-index-publisher/release_linux-x64/bootstrap
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222
with:
2323
ref: ${{ inputs.ref }}
2424
- name: Amazon Linux 2023 build

.github/workflows/ci.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
validate-assembler:
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v5
2424

2525
- name: Bootstrap Action Workspace
2626
id: bootstrap
@@ -44,7 +44,7 @@ jobs:
4444
run:
4545
working-directory: src/Elastic.Documentation.Site
4646
steps:
47-
- uses: actions/checkout@v4
47+
- uses: actions/checkout@v5
4848

4949
- uses: actions/setup-node@v4
5050
with:
@@ -78,7 +78,7 @@ jobs:
7878
- macos-latest
7979
- windows-latest
8080
steps:
81-
- uses: actions/checkout@v4
81+
- uses: actions/checkout@v5
8282

8383
- name: Bootstrap Action Workspace
8484
id: bootstrap
@@ -94,12 +94,24 @@ jobs:
9494
run: dotnet run --project build -c release -- unit-test
9595

9696
- name: Publish AOT
97+
if: ${{ matrix.os != 'ubuntu-latest' }} # publish containers already validates AOT build
9798
run: dotnet run --project build -c release -- publishbinaries
99+
100+
- name: Publish Containers
101+
if: ${{ matrix.os == 'ubuntu-latest' }}
102+
env:
103+
DOCKER_NO_PUBLISH: true
104+
run: dotnet run --project build -c release -- publishcontainers
105+
106+
- name: Run Container
107+
if: ${{ matrix.os == 'ubuntu-latest' }}
108+
run: dotnet run --project build -c release -- runlocalcontainer
109+
98110

99111
integration:
100112
runs-on: docs-builder-latest-16
101113
steps:
102-
- uses: actions/checkout@v4
114+
- uses: actions/checkout@v5
103115

104116
- name: Bootstrap Action Workspace
105117
id: bootstrap

.github/workflows/create-major-tag.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
create-major-tag:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919
- name: Get major version
2020
run: |
2121
MAJOR_VERSION=$(echo "${GITHUB_REF#refs/tags/}" | awk -F. '{print $1}')

.github/workflows/deploy-api-lambda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
env:
2525
ZIP_FILE: api-lambda.zip
2626
steps:
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@v5
2828
- name: Download bootstrap binary
2929
uses: actions/download-artifact@v4
3030
with:

.github/workflows/license.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515

1616
- name: Check license headers
1717
run: |

.github/workflows/prerelease.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727
- id: repo-basename
2828
run: 'echo "value=`basename ${{ github.repository }}`" >> $GITHUB_OUTPUT'
29-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v5
3030
- name: Setup Pages
3131
id: pages
3232
uses: actions/[email protected]
@@ -35,7 +35,7 @@ jobs:
3535
with:
3636
prefix: '${{ steps.repo-basename.outputs.value }}'
3737
- name: Upload artifact
38-
uses: actions/upload-pages-artifact@v3.0.1
38+
uses: actions/upload-pages-artifact@v4.0.0
3939
with:
4040
path: .artifacts/docs/html
4141

@@ -50,7 +50,7 @@ jobs:
5050
major-version: ${{ steps.bootstrap.outputs.major-version }}
5151

5252
steps:
53-
- uses: actions/checkout@v4
53+
- uses: actions/checkout@v5
5454

5555
- name: Bootstrap Action Workspace
5656
id: bootstrap

.github/workflows/preview-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
steps:
130130
- name: Checkout
131131
if: contains(fromJSON('["push", "merge_group", "workflow_dispatch"]'), github.event_name)
132-
uses: actions/checkout@v4
132+
uses: actions/checkout@v5
133133
with:
134134
ref: ${{ github.event.pull_request.head.sha || github.ref }}
135135

@@ -228,7 +228,7 @@ jobs:
228228
needs.check.outputs.any_modified == 'true'
229229
|| contains(fromJSON('["push", "workflow_dispatch"]'), github.event_name)
230230
)
231-
uses: actions/checkout@v4
231+
uses: actions/checkout@v5
232232
with:
233233
ref: ${{ github.event.pull_request.head.sha || github.ref }}
234234
persist-credentials: false

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
major-version: ${{ steps.bootstrap.outputs.major-version }}
5353

5454
steps:
55-
- uses: actions/checkout@v4
55+
- uses: actions/checkout@v5
5656
with:
5757
ref: ${{ needs.release-drafter.outputs.tag_name }}
5858
- name: Bootstrap Action Workspace
@@ -67,7 +67,7 @@ jobs:
6767
password: ${{ secrets.GITHUB_TOKEN }}
6868

6969
- name: Publish Containers
70-
run: ./build.sh publishcontainers\
70+
run: ./build.sh publishcontainers
7171

7272
build-lambda:
7373
needs:
@@ -133,7 +133,7 @@ jobs:
133133
major-version: ${{ steps.bootstrap.outputs.major-version }}
134134

135135
steps:
136-
- uses: actions/checkout@v4
136+
- uses: actions/checkout@v5
137137
with:
138138
ref: ${{ needs.release-drafter.outputs.tag_name }}
139139

@@ -146,7 +146,7 @@ jobs:
146146
shell: bash
147147

148148
- name: Generate artifact attestation
149-
uses: actions/attest-build-provenance@v2
149+
uses: actions/attest-build-provenance@v3
150150
with:
151151
subject-path: |
152152
.artifacts/publish/docs-builder/release/*.zip

.github/workflows/required-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
pull-requests: write
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222
- id: get-labels
2323
run: |
2424
labels=$(yq '[.categories[].labels] + .exclude-labels | flatten | unique | sort | @tsv' .github/release-drafter.yml | tr '\t' ',')

0 commit comments

Comments
 (0)