From ac81f49d28c36749449eb399e4b769165fcff2e8 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Mon, 8 Sep 2025 12:40:36 +0200
Subject: [PATCH 1/2] maint(ios): use versioned filenames for PR artifacts

Relates-to: #10521
Test-bot: skip
Build-bot: skip release:ios
---
 ios/tools/prepRelease.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/ios/tools/prepRelease.sh b/ios/tools/prepRelease.sh
index 28adfbe1ff..138823d51e 100755
--- a/ios/tools/prepRelease.sh
+++ b/ios/tools/prepRelease.sh
@@ -29,8 +29,7 @@ fi
 . $KEYMAN_ROOT/resources/build/history/history-utils.sh         #includes the following
 #. ../resources/build/utils.inc.sh
 
-BUILD_NUMBER=`cat ../VERSION.md`
-KEYMAN_TIER=`cat ../TIER.md`
+BUILD_NUMBER="${KEYMAN_VERSION}"
 
 KEYMAN_CHANGELOG="changelog-${BUILD_NUMBER}-${KEYMAN_TIER}.txt"
 CHANGELOG_PATH="upload/$BUILD_NUMBER/$KEYMAN_CHANGELOG"
@@ -59,7 +58,7 @@ mv -f "$CHANGELOG_PATH.1" "$CHANGELOG_PATH"
 # Keyman Engine
 #
 
-KMEI_DST_NAME="keyman-engine-ios-${BUILD_NUMBER}.zip"
+KMEI_DST_NAME="keyman-engine-ios-${KEYMAN_VERSION_FOR_PR_FILENAME}.zip"
 KMEI_DST="${WORK_DIR}/${UPLOAD_DIR}/${KMEI_DST_NAME}"
 
 KMEI_FRAMEWORK_BASE="build/Build/Products/Release/"
@@ -87,14 +86,14 @@ cd "$WORK_DIR"
 #
 
 KEYMANAPP_IPA="build/Build/Products/Release-iphoneos/Keyman.ipa"
-KEYMANAPP_IPA_DST="keyman-ios-${BUILD_NUMBER}.ipa"
+KEYMANAPP_IPA_DST="keyman-ios-${KEYMAN_VERSION_FOR_PR_FILENAME}.ipa"
 
 echo "Copying Keyman IPA ${KEYMANAPP_IPA} => ${UPLOAD_DIR}/${KEYMANAPP_IPA_DST}..."
 cp "${KEYMANAPP_IPA}" "${WORK_DIR}/${UPLOAD_DIR}/${KEYMANAPP_IPA_DST}"
 
 KEYMANAPP_SIM_FOLDER="build/Build/Products/Release-iphonesimulator"
 KEYMANAPP_SIM_APP="$KEYMANAPP_SIM_FOLDER/Keyman.app"
-KEYMANAPP_SIM_APP_DST="keyman-ios-simulator-${BUILD_NUMBER}.app.zip"
+KEYMANAPP_SIM_APP_DST="keyman-ios-simulator-${KEYMAN_VERSION_FOR_PR_FILENAME}.app.zip"
 
 echo "Zipping Keyman simulator artifact ${KEYMANAPP_SIM_APP} => ${UPLOAD_DIR}/${KEYMANAPP_SIM_APP_DST}..."
 cd "${KEYMANAPP_SIM_FOLDER}"
@@ -108,14 +107,14 @@ cd "$WORK_DIR"
 
 if [ "${RELEASE_OEM_FIRSTVOICES}" = true ]; then
   FIRSTVOICESAPP_IPA="../oem/firstvoices/ios/build/Build/Products/Release-iphoneos/FirstVoices.ipa"
-  FIRSTVOICESAPP_IPA_DST="firstvoices-ios-${BUILD_NUMBER}.ipa"
+  FIRSTVOICESAPP_IPA_DST="firstvoices-ios-${KEYMAN_VERSION_FOR_PR_FILENAME}.ipa"
 
   echo "Copying FirstVoices IPA ${FIRSTVOICESAPP_IPA} => ${UPLOAD_DIR}/${FIRSTVOICESAPP_IPA_DST}..."
   cp "${FIRSTVOICESAPP_IPA}" "${WORK_DIR}/${UPLOAD_DIR}/${FIRSTVOICESAPP_IPA_DST}"
 
   FIRSTVOICESAPP_SIM_FOLDER="../oem/firstvoices/ios/build/Build/Products/Release-iphonesimulator/"
   FIRSTVOICESAPP_SIM_APP="$FIRSTVOICESAPP_SIM_FOLDER/FirstVoices.app"
-  FIRSTVOICESAPP_SIM_APP_DST="firstvoices-ios-simulator-${BUILD_NUMBER}.app.zip"
+  FIRSTVOICESAPP_SIM_APP_DST="firstvoices-ios-simulator-${KEYMAN_VERSION_FOR_PR_FILENAME}.app.zip"
 
   echo "Zipping FirstVoices simulator artifact ${FIRSTVOICESAPP_SIM_APP} => ${UPLOAD_DIR}/${KEYMANAPP_SIM_APP_DST}..."
   cd "${FIRSTVOICESAPP_SIM_FOLDER}"

From 18ebb0baf3c52524ec9c55acca82fb93bf1ef6bb Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Mon, 8 Sep 2025 13:29:03 +0200
Subject: [PATCH 2/2] maint(ios): use versioned filename for testflight upload

Build-bot: skip build:ios
---
 resources/teamcity/ios/keyman-ios-test.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/resources/teamcity/ios/keyman-ios-test.sh b/resources/teamcity/ios/keyman-ios-test.sh
index 1c6f156238..830fdc156b 100755
--- a/resources/teamcity/ios/keyman-ios-test.sh
+++ b/resources/teamcity/ios/keyman-ios-test.sh
@@ -52,16 +52,14 @@ function __do_upload_to_testflight() {
     local FASTLANE_ITC_PROVIDER="$1"
     local FASTLANE_API_KEY_ID="$2"
     local APP_IPA_DST
-    local BUILD_NUMBER
 
     export FASTLANE_ITC_TEAM_ID="$3"
     export LC_ALL=en_US.UTF-8
     export LANG=en_US.UTF-8
 
-    BUILD_NUMBER=$(cat ../VERSION.md)
-    APP_IPA_DST="$4-ios-${BUILD_NUMBER}.ipa"
+    APP_IPA_DST="$4-ios-${KEYMAN_VERSION_FOR_PR_FILENAME}.ipa"
 
-    cd "upload/${BUILD_NUMBER}"
+    cd "upload/${KEYMAN_VERSION}"
     command -v fastlane
     # shellcheck disable=SC2154
     fastlane pilot upload \