Skip to content

Commit 1ac185c

Browse files
authored
Fix versioning helper (#2141)
## Description When we tagged `v2026.0.0-alpha-1`, we broke the versioning-helper logic. It doesn't expect `alpha` in the version string. This PR adds matching for lowercase alphanumeric to the versioning helper, which resolves that issue. Also turns out `getProviders()` is now broken as a gradle method. Sad. ## Meta Merge checklist: - [x] Pull Request title is [short, imperative summary](https://cbea.ms/git-commit/) of proposed changes - [x] The description documents the _what_ and _why_ - [ ] If this PR changes behavior or adds a feature, user documentation is updated - [ ] If this PR touches photon-serde, all messages have been regenerated and hashes have not changed unexpectedly - [ ] If this PR touches configuration, this is backwards compatible with settings back to v2025.3.2 - [ ] If this PR touches pipeline settings or anything related to data exchange, the frontend typing is updated - [ ] If this PR addresses a bug, a regression test for it is added
1 parent 7170c29 commit 1ac185c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

versioningHelper.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ gradle.allprojects {
88
def stdout = new ByteArrayOutputStream()
99
String tagIsh
1010
try {
11-
Project.getProviders().exec {
11+
project.exec {
1212
commandLine 'git', 'describe', '--tags', "--match=v*"
1313
standardOutput = stdout
1414
}
@@ -19,7 +19,7 @@ gradle.allprojects {
1919

2020
// Dev tags: v2021.1.6-3-gf922466d
2121
// We're specifically looking to capture the middle -3-
22-
boolean isDev = tagIsh.matches(".*-[0-9]*-g[0-9a-f]*")
22+
boolean isDev = tagIsh.matches(".*-[0-9a-z]*-g[0-9a-f]*")
2323
if (isDev && !tagIsh.startsWith("dev-")) tagIsh = "dev-" + tagIsh
2424
println("Picked up version: " + tagIsh)
2525
return tagIsh

0 commit comments

Comments
 (0)