From 1ac185c24751af507e53fb1c03ce3ec1a5d297d3 Mon Sep 17 00:00:00 2001 From: Sam Freund Date: Tue, 21 Oct 2025 00:14:57 -0500 Subject: [PATCH] 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 --- versioningHelper.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versioningHelper.gradle b/versioningHelper.gradle index 3e5ee33f0..b2e5e0199 100644 --- a/versioningHelper.gradle +++ b/versioningHelper.gradle @@ -8,7 +8,7 @@ gradle.allprojects { def stdout = new ByteArrayOutputStream() String tagIsh try { - Project.getProviders().exec { + project.exec { commandLine 'git', 'describe', '--tags', "--match=v*" standardOutput = stdout } @@ -19,7 +19,7 @@ gradle.allprojects { // Dev tags: v2021.1.6-3-gf922466d // We're specifically looking to capture the middle -3- - boolean isDev = tagIsh.matches(".*-[0-9]*-g[0-9a-f]*") + boolean isDev = tagIsh.matches(".*-[0-9a-z]*-g[0-9a-f]*") if (isDev && !tagIsh.startsWith("dev-")) tagIsh = "dev-" + tagIsh println("Picked up version: " + tagIsh) return tagIsh