Fix normalized version suffix

Automattic · Dec 11, 2024 · 5919dbe · 5919dbe
1 parent 287a659
commit 5919dbe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -147,6 +147,7 @@ steps:
       buildkite-agent artifact download "*.app.zip" .
       buildkite-agent artifact download "*.dmg" .
       buildkite-agent artifact download "*.exe" .
+      buildkite-agent artifact download "*.appx" .
       buildkite-agent artifact download "*.nupkg" .
       buildkite-agent artifact download "*\\RELEASES" .
 
@@ -248,6 +249,7 @@ steps:
       buildkite-agent artifact download "*.zip" .
       buildkite-agent artifact download "*.dmg" .
       buildkite-agent artifact download "*.exe" .
+      buildkite-agent artifact download "*.appx" .
       buildkite-agent artifact download "*.nupkg" .
       buildkite-agent artifact download "*\\RELEASES" .
 

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -93,7 +93,7 @@ def distribute_builds(
   # If we are distributing a build without a tag, i.e. a development build, we also want to update the latest build reference for distribution.
   update_latest = release_tag.nil?
   suffix = release_tag.nil? ? commit_hash : release_tag
-  normalized_version = suffix.gsub(/-.*/, '')
+  normalized_version = suffix.gsub(/^v|-.*/, '')
   filename_root = 'studio'
   bucket_folder = 'studio'