Skip to content

Commit 0eda77b

Browse files
authored
Merge branch 'main' into updatecli_main_bfbda0570cfbf1ebee5ba4801497a4b00fe1289653863b5c09f26db4b8c67c6e
2 parents f5d710f + 1a2d1c6 commit 0eda77b

File tree

2 files changed

+34
-30
lines changed

2 files changed

+34
-30
lines changed

config/versions.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
versioning_systems:
2+
# This file contains the version numbers for various Elastic products and tools.
3+
# Updates for Stack versions are manual
24
stack: &stack
35
base: 9.0
46
current: 9.1.0
@@ -9,7 +11,8 @@ versioning_systems:
911
base: 99999
1012
current: 99999
1113

12-
# deployment types
14+
# Deployment types
15+
# Ece version updates are manual
1316
ece:
1417
base: 4.0
1518
current: 4.1
@@ -19,16 +22,14 @@ versioning_systems:
1922
current: 3.0.0
2023
ess: *all
2124
self: *stack
22-
23-
# things that i don't know about
2425
ecctl:
2526
base: 1.0
2627
current: 1.15.0
2728
curator:
2829
base: 8.0
2930
current: 8.0.21
3031

31-
# serverless
32+
# Serverless
3233
serverless: *all
3334
elasticsearch: *all
3435
observability: *all

updatecli/updatecli.d/versions.yml

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,24 @@ actions:
2121
spec:
2222
automerge: false
2323
labels:
24-
- dependencies
24+
- chore
2525
title: '[Automation] Bump product version numbers'
2626

2727
sources:
28-
latest-stack-version:
29-
name: Get latest stack version
30-
kind: githubrelease
31-
transformers:
32-
- trimprefix: v
33-
spec:
34-
owner: elastic
35-
repository: elasticsearch
36-
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
37-
username: '{{ requiredEnv "GITHUB_ACTOR" }}'
38-
versionfilter:
39-
kind: regex
40-
pattern: "v9.(\\d*).(\\d*)$"
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*)$"
4142

4243
latest-edot-android-version:
4344
name: Get latest release version for the apm-agent-android
@@ -234,7 +235,8 @@ sources:
234235
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
235236
username: '{{ requiredEnv "GITHUB_ACTOR" }}'
236237
versionfilter:
237-
kind: latest
238+
kind: regex
239+
pattern: "^v(\\d*).(\\d*).(\\d*)$"
238240

239241
latest-apm-agent-php-version:
240242
name: Get latest release version for APM PHP agent
@@ -279,25 +281,26 @@ sources:
279281
name: Get latest release version for APM RUM agent
280282
kind: githubrelease
281283
transformers:
282-
- trimprefix: v
284+
- trimprefix: "@elastic/apm-rum@"
283285
spec:
284286
owner: elastic
285287
repository: apm-agent-rum-js
286288
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
287289
username: '{{ requiredEnv "GITHUB_ACTOR" }}'
288290
versionfilter:
289-
kind: latest
291+
kind: regex
292+
pattern: "^@elastic/apm-rum@(\\d*).(\\d*).(\\d*)$"
290293

291294
targets:
292-
update-docs-docset-stack:
293-
name: 'Update config/versions.yml stack {{ source "latest-stack-version" }}'
294-
scmid: githubConfig
295-
sourceid: latest-stack-version
296-
kind: file
297-
spec:
298-
file: config/versions.yml
299-
matchpattern: '(stack: &stack\s+base: [\d\.]+\s+current:)\s+(.+)'
300-
replacepattern: '$1 {{ source "latest-stack-version" }}'
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" }}'
301304

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

0 commit comments

Comments
 (0)