Skip to content

Commit d444d6b

Browse files
authored
[8.19] [CI] New info versions json / Remove some backport label usage (#234308) (#236575)
# Backport This will backport the following commits from `main` to `8.19`: - [[CI] New info versions json / Remove some backport label usage (#234308)](#234308) <!--- Backport version: 10.0.2 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Alex Szabo","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-09-26T11:00:15Z","message":"[CI] New info versions json / Remove some backport label usage (#234308)\n\n## Summary\nMerge with https://github.com/elastic/kibana-github-actions/pull/60\nPart of: https://github.com/elastic/kibana-operations/issues/300\n\nThis PR updates the `versions.json` to a new format, that no longer\nmanages major/minor identity, but introduces a label: `branchType:\n'development' | 'release' | 'unmaintained'`.\n\nAlso removes the obsolete label usage for `backport:prev-minor`,\n`backport:prev-major`, `backport:current-major`","sha":"fb391fa59da0c0bdc9c4997b69c21111c86025da","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","backport:all-open","ci:cloud-deploy","v9.2.0"],"title":"[CI] New info versions json / Remove some backport label usage","number":234308,"url":"https://github.com/elastic/kibana/pull/234308","mergeCommit":{"message":"[CI] New info versions json / Remove some backport label usage (#234308)\n\n## Summary\nMerge with https://github.com/elastic/kibana-github-actions/pull/60\nPart of: https://github.com/elastic/kibana-operations/issues/300\n\nThis PR updates the `versions.json` to a new format, that no longer\nmanages major/minor identity, but introduces a label: `branchType:\n'development' | 'release' | 'unmaintained'`.\n\nAlso removes the obsolete label usage for `backport:prev-minor`,\n`backport:prev-major`, `backport:current-major`","sha":"fb391fa59da0c0bdc9c4997b69c21111c86025da"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/234308","number":234308,"mergeCommit":{"message":"[CI] New info versions json / Remove some backport label usage (#234308)\n\n## Summary\nMerge with https://github.com/elastic/kibana-github-actions/pull/60\nPart of: https://github.com/elastic/kibana-operations/issues/300\n\nThis PR updates the `versions.json` to a new format, that no longer\nmanages major/minor identity, but introduces a label: `branchType:\n'development' | 'release' | 'unmaintained'`.\n\nAlso removes the obsolete label usage for `backport:prev-minor`,\n`backport:prev-major`, `backport:current-major`","sha":"fb391fa59da0c0bdc9c4997b69c21111c86025da"}}]}] BACKPORT-->
1 parent b943302 commit d444d6b

File tree

3 files changed

+25
-55
lines changed

3 files changed

+25
-55
lines changed

.github/workflows/on-merge.yml

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,15 @@ jobs:
99
name: 'Label and Backport'
1010
runs-on: ubuntu-latest
1111
if: |
12-
github.event.pull_request.merged == true
13-
&& (
14-
(
15-
github.event.action == 'labeled' && (
16-
github.event.label.name == 'backport:prev-minor'
17-
|| github.event.label.name == 'backport:prev-major'
18-
|| github.event.label.name == 'backport:current-major'
19-
|| github.event.label.name == 'backport:all-open'
20-
|| github.event.label.name == 'backport:version'
21-
|| github.event.label.name == 'auto-backport'
22-
)
23-
)
24-
|| (github.event.action == 'closed')
25-
)
12+
github.event.pull_request.merged == true &&
13+
(github.event.action == 'closed' ||
14+
(github.event.action == 'labeled' &&
15+
(github.event.label.name == 'backport:all-open' ||
16+
github.event.label.name == 'backport:version')) ||
17+
(github.event.action == 'unlabeled' &&
18+
github.event.label.name == 'backport:skip' &&
19+
(contains(github.event.pull_request.labels.*.name, 'backport:all-open') ||
20+
contains(github.event.pull_request.labels.*.name, 'backport:version'))))
2621
steps:
2722
- name: Checkout Actions
2823
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

dev_docs/contributing/how_we_use_github.mdx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,6 @@ The following labels are related to backporting PRs:
209209

210210
- `backport:version`: Automatically backport this PR (to the branches related to
211211
version labels) after it's merged. Requires adding desired target versions labels.
212-
- `backport:prev-minor`: Automatically backport to one lower minor version.
213-
- `backport:prev-major`: Automatically backport to all minor version of one lower major version.
214-
- `backport:current-major`: Automatically backport to all minor version of the current major version.
215212
- `backport:all-open`: Automatically backport to all generally available versions. This functionally is equivalent to backport:prev-major at the time of writing.
216213
- `backport:skip`: This PR does not require backporting.
217214
- `backport`: This PR was backported (added by CI).

renovate.json

Lines changed: 16 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@
9696
],
9797
"labels": [
9898
"Team:Operations",
99-
"release_note:skip",
100-
"backport:current-major"
99+
"release_note:skip"
101100
],
102101
"enabled": true,
103102
"matchManagers": [
@@ -1183,8 +1182,7 @@
11831182
],
11841183
"labels": [
11851184
"Team:Visualizations",
1186-
"release_note:skip",
1187-
"backport:prev-minor"
1185+
"release_note:skip"
11881186
],
11891187
"enabled": true
11901188
},
@@ -1220,7 +1218,6 @@
12201218
],
12211219
"labels": [
12221220
"release_note:skip",
1223-
"backport:prev-minor",
12241221
"Team:Operations",
12251222
"Team:Core"
12261223
],
@@ -1241,7 +1238,6 @@
12411238
],
12421239
"labels": [
12431240
"release_note:skip",
1244-
"backport:prev-minor",
12451241
"Team:Operations",
12461242
"Team:QA"
12471243
],
@@ -1308,9 +1304,7 @@
13081304
"labels": [
13091305
"release_note:skip",
13101306
"Team:Security",
1311-
"Team:Core",
1312-
"backport:prev-minor",
1313-
"backport:prev-major"
1307+
"Team:Core"
13141308
],
13151309
"minimumReleaseAge": "7 days",
13161310
"enabled": true
@@ -1332,9 +1326,7 @@
13321326
"labels": [
13331327
"release_note:skip",
13341328
"Team:Security",
1335-
"Team:Core",
1336-
"backport:prev-minor",
1337-
"backport:prev-major"
1329+
"Team:Core"
13381330
],
13391331
"minimumReleaseAge": "7 days",
13401332
"enabled": true
@@ -1355,9 +1347,7 @@
13551347
],
13561348
"labels": [
13571349
"release_note:skip",
1358-
"Team:Core",
1359-
"backport:prev-minor",
1360-
"backport:prev-major"
1350+
"Team:Core"
13611351
],
13621352
"enabled": true
13631353
},
@@ -1392,8 +1382,7 @@
13921382
],
13931383
"labels": [
13941384
"release_note:skip",
1395-
"Team:Core",
1396-
"backport:prev-minor"
1385+
"Team:Core"
13971386
],
13981387
"enabled": true
13991388
},
@@ -1429,8 +1418,7 @@
14291418
],
14301419
"labels": [
14311420
"release_note:skip",
1432-
"Team:Core",
1433-
"backport:prev-minor"
1421+
"Team:Core"
14341422
],
14351423
"enabled": true
14361424
},
@@ -1448,8 +1436,7 @@
14481436
],
14491437
"labels": [
14501438
"release_note:skip",
1451-
"Team:Core",
1452-
"backport:prev-minor"
1439+
"Team:Core"
14531440
],
14541441
"enabled": true
14551442
},
@@ -1468,8 +1455,7 @@
14681455
],
14691456
"labels": [
14701457
"release_note:skip",
1471-
"Team:Core",
1472-
"backport:prev-minor"
1458+
"Team:Core"
14731459
],
14741460
"minimumReleaseAge": "7 days",
14751461
"enabled": true
@@ -1500,8 +1486,7 @@
15001486
],
15011487
"labels": [
15021488
"release_note:skip",
1503-
"Team:Core",
1504-
"backport:prev-minor"
1489+
"Team:Core"
15051490
],
15061491
"minimumReleaseAge": "7 days",
15071492
"enabled": true
@@ -2157,8 +2142,7 @@
21572142
"labels": [
21582143
"Feature:Vega",
21592144
"Team:Visualizations",
2160-
"release_note:skip",
2161-
"backport:prev-minor"
2145+
"release_note:skip"
21622146
],
21632147
"minimumReleaseAge": "7 days",
21642148
"enabled": true
@@ -2178,8 +2162,7 @@
21782162
"labels": [
21792163
"Feature:Vega",
21802164
"Team:Visualizations",
2181-
"release_note:skip",
2182-
"backport:prev-minor"
2165+
"release_note:skip"
21832166
],
21842167
"minimumReleaseAge": "7 days",
21852168
"enabled": true
@@ -2205,8 +2188,7 @@
22052188
"labels": [
22062189
"Feature:Vega",
22072190
"Team:Visualizations",
2208-
"release_note:skip",
2209-
"backport:prev-minor"
2191+
"release_note:skip"
22102192
],
22112193
"dependencyDashboardApproval": true,
22122194
"minimumReleaseAge": "7 days",
@@ -2243,8 +2225,7 @@
22432225
"labels": [
22442226
"Feature:Vega",
22452227
"Team:Visualizations",
2246-
"release_note:skip",
2247-
"backport:prev-minor"
2228+
"release_note:skip"
22482229
],
22492230
"minimumReleaseAge": "7 days",
22502231
"enabled": true
@@ -4298,7 +4279,6 @@
42984279
"Team:Monitoring",
42994280
"Team:Core",
43004281
"Team:Security",
4301-
"backport:prev-minor",
43024282
"release_note:skip"
43034283
],
43044284
"minimumReleaseAge": "7 days",
@@ -4460,8 +4440,7 @@
44604440
],
44614441
"labels": [
44624442
"Team:Visualizations",
4463-
"release_note:skip",
4464-
"backport:prev-minor"
4443+
"release_note:skip"
44654444
],
44664445
"enabled": true
44674446
},
@@ -4576,7 +4555,6 @@
45764555
],
45774556
"labels": [
45784557
"Team:Operations",
4579-
"backport:prev-minor",
45804558
"release_note:skip"
45814559
],
45824560
"minimumReleaseAge": "7 days",
@@ -4659,4 +4637,4 @@
46594637
"datasourceTemplate": "docker"
46604638
}
46614639
]
4662-
}
4640+
}

0 commit comments

Comments
 (0)