Skip to content

Commit 26c8fa5

Browse files
authored
Merge branch 'main' into add-deeplink-anchors-dropdown
2 parents fa2ea6b + 9bd478c commit 26c8fa5

File tree

4 files changed

+35
-33
lines changed

4 files changed

+35
-33
lines changed

.github/updatecli/updatecli.d/versions.yml

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,14 @@ actions:
2525
title: '[Automation] Bump product version numbers'
2626

2727
sources:
28-
# TODO Automate only for patch releases
29-
# latest-stack-version:
30-
# name: Get latest stack version
31-
# kind: githubrelease
32-
# transformers:
33-
# - trimprefix: v
34-
# spec:
35-
# owner: elastic
36-
# repository: elasticsearch
37-
# token: '{{ requiredEnv "GITHUB_TOKEN" }}'
38-
# username: '{{ requiredEnv "GITHUB_ACTOR" }}'
39-
# versionfilter:
40-
# kind: regex
41-
# pattern: "v9.(\\d*).(\\d*)$"
28+
latest-stack-version:
29+
name: Get latest stack version
30+
kind: json
31+
spec:
32+
files:
33+
- https://artifacts.elastic.co/releases/stack.json
34+
engine: dasel/v2
35+
key: "releases.last().version"
4236

4337
latest-edot-android-version:
4438
name: Get latest release version for the apm-agent-android
@@ -292,15 +286,15 @@ sources:
292286
pattern: "^@elastic/apm-rum@(\\d*).(\\d*).(\\d*)$"
293287

294288
targets:
295-
# update-docs-docset-stack:
296-
# name: 'Update config/versions.yml stack {{ source "latest-stack-version" }}'
297-
# scmid: githubConfig
298-
# sourceid: latest-stack-version
299-
# kind: file
300-
# spec:
301-
# file: config/versions.yml
302-
# matchpattern: '(stack: &stack\s+base: [\d\.]+\s+current:)\s+(.+)'
303-
# replacepattern: '$1 {{ source "latest-stack-version" }}'
289+
update-docs-docset-stack:
290+
name: 'Update config/versions.yml stack {{ source "latest-stack-version" }}'
291+
scmid: githubConfig
292+
sourceid: latest-stack-version
293+
kind: file
294+
spec:
295+
file: config/versions.yml
296+
matchpattern: '(stack: &stack\s+base: [\d\.]+\s+current:)\s+(.+)'
297+
replacepattern: '$1 {{ source "latest-stack-version" }}'
304298

305299
update-docs-docset-android:
306300
name: 'Update config/versions.yml edot-android {{ source "latest-edot-android-version" }}'

.github/workflows/updatecli.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
bump:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020

2121
- name: Get token
2222
id: get_token
@@ -35,6 +35,7 @@ jobs:
3535
- uses: elastic/oblt-actions/updatecli/run@v1
3636
with:
3737
command: apply --config .github/updatecli/updatecli.d/versions.yml --values .github/updatecli/values.d/scm.yml
38+
version-file: .updatecli-version
3839
env:
3940
GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
4041

.updatecli-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v0.105.1

docs/contribute/_snippets/tag-processing.md

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,23 @@
22

33
Specifically for versioned products, badges will display differently when the `applies_to` key specifies a product version that has not been released to our customers yet.
44

5-
* `Planned` (if the lifecycle is preview, beta, or ga)
6-
7-
Example: {applies_to}`stack: ga 99.99`
8-
* `Deprecation planned` (if the lifecycle is deprecated)
9-
10-
Example: {applies_to}`stack: deprecated 99.99`
11-
* `Removal planned` (if the lifecycle is removed)
5+
The following table shows how badges for versioned products are displayed based on the release status for each lifecycle value. Hover over the example badges for the tooltip text.
126

13-
Example: {applies_to}`stack: removed 99.99`
7+
| Lifecycle | Release status | Badge text examples |
8+
|-------------|----------------|---------------------------------------|
9+
| preview | prerelease | {applies_to}`stack: preview 99.99` |
10+
| | post-release | {applies_to}`stack: preview 9.1` |
11+
| beta | prerelease | {applies_to}`stack: beta 99.99` |
12+
| | post-release | {applies_to}`stack: beta 9.1` |
13+
| ga | prerelease | {applies_to}`stack: ga 99.99` |
14+
| | post-release | {applies_to}`stack: ga 9.1` |
15+
| deprecated | prerelease | {applies_to}`stack: deprecated 99.99` |
16+
| | post-release | {applies_to}`stack: deprecated 9.1` |
17+
| removed | prerelease | {applies_to}`stack: removed 99.99` |
18+
| | post-release | {applies_to}`stack: removed 9.1` |
19+
20+
This is computed at build time (there is a docs build every 30 minutes). The documentation team tracks and maintains released versions for these products centrally in [`versions.yml`](https://github.com/elastic/docs-builder/blob/main/config/versions.yml).
1421

15-
This is computed at build time (there is a docs build every 30 minutes). The documentation team tracks and maintains released versions for these products centrally in [`versions.yml`](https://github.com/elastic/docs-builder/blob/main/config/versions.yml).
1622
When multiple lifecycle statuses and versions are specified in the sources, several badges are shown.
1723

1824
:::{note}

0 commit comments

Comments
 (0)