Skip to content

Commit 135cf24

Browse files
committed
Pass appropriate backport branches to generation task
1 parent 2d23d5c commit 135cf24

File tree

2 files changed

+26
-3
lines changed

2 files changed

+26
-3
lines changed
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,10 @@
1-
steps: []
1+
steps:
2+
- label: update-transport-versions
3+
command: '.buildkite/scripts/update-transport-versions.sh'
4+
# New transport versions are always added via the main branch
5+
if: build.env('BUILDKITE_PULL_REQUEST_BASE_BRANCH') == 'main'
6+
agents:
7+
provider: gcp
8+
image: family/elasticsearch-ubuntu-2404
9+
machineType: custom-16-32768
10+
buildDirectory: /dev/shm/bk

.buildkite/scripts/update-transport-versions.sh

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,24 @@ if ! git diff --exit-code; then
1111
exit 0
1212
fi
1313

14-
NEW_COMMIT_MESSAGE="[CI] Update transport versions"
14+
NEW_COMMIT_MESSAGE="[CI] Update transport version definitions"
1515

1616
echo "--- Generating updated transport version definitions"
17-
.ci/scripts/run-gradle.sh generateTransportVersionDefinition
17+
# Calculate backport branches based on pull request version labels
18+
backport_branches=$(
19+
echo "${GITHUB_PR_LABELS}" \
20+
| tr ',' '\n' \
21+
| grep -E "v[0-9]+\.[0-9]+\.[0-9]+" \
22+
| sed -E 's/^v([0-9]+)\.([0-9]+)\.[0-9]+$/\1.\2/' \
23+
| paste -sd, -
24+
)
25+
26+
if [[ -z "${backport_branches}" ]]; then
27+
echo "Skipping as pull request contains no version labels"
28+
exit 0
29+
fi
30+
31+
.ci/scripts/run-gradle.sh generateTransportVersionDefinition --backport_branches="${backport_branches}"
1832

1933
if git diff --exit-code; then
2034
echo "No changes found after updating transport versions. Don't need to auto commit."

0 commit comments

Comments
 (0)