Pass platform through to standalone

We need the target platform in the script that creates the dmg for
macOS, since it could be either osx-64 or osx-arm64. Previously it was
always osx-64 so could be hard-coded.

I also added the platform name to the dmg file name to avoid a clash
when making both the osx-64 and osx-arm64 standalones.

Author: jclarkeSTFC

buildconfig/Jenkins/Conda/nightly_build_and_deploy.jenkinsfile

@@ -368,7 +368,7 @@ pipeline {
 
               package_conda("${PLATFORM}", "workbench")
               archive_conda_packages("${PLATFORM}")
-              package_standalone()
+              package_standalone("${PLATFORM}")
               archive_standalone_package("${PLATFORM}")
             }
             post {
@@ -622,23 +622,23 @@ def generate_git_tag() {
   return git_tag
 }
 
-def package_standalone() {
+def package_standalone(platform) {
   packagescript_path = "${CISCRIPT_DIR}/package-standalone"
   if(isUnix()) {
-    sh "${packagescript_path} ${WORKSPACE} ${package_standalone_options()}"
+    sh "${packagescript_path} ${WORKSPACE} ${package_standalone_options(platform)}"
   } else {
     workspace_unix_style = toUnixStylePath("${WORKSPACE}")
     bat "\"${WIN_BASH}\" -ex -c \"${packagescript_path} ${workspace_unix_style}\
-      ${package_standalone_options()}\""
+      ${package_standalone_options(platform)}\""
   }
 }
 
-def package_standalone_options() {
+def package_standalone_options(platform) {
   package_options = ""
   if(PACKAGE_SUFFIX.trim() != '') {
     package_options += " --package-suffix ${PACKAGE_SUFFIX}"
   }
-  return package_options.trim()
+  return package_options.trim() + " --platform ${platform}"
 }
 
 // Determine whether this build should be marked as a prerelease on GitHub.

buildconfig/Jenkins/Conda/package-standalone

@@ -18,6 +18,7 @@
 #
 # Possible parameters:
 #   --package-suffix: An optional suffix to pass to the standalone package step.
+#   --platform: Target platform, e.g. linux-64
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source $SCRIPT_DIR/mamba-utils
@@ -44,12 +45,16 @@ fi
 
 # Parse options
 STANDALONE_PACKAGE_SUFFIX=
+PLATFORM=""
 while [ ! $# -eq 0 ]
 do
     case "$1" in
         --package-suffix)
             STANDALONE_PACKAGE_SUFFIX="$2"
             shift ;;
+        --platform)
+            PLATFORM="$2"
+            shift ;;
         *)
             echo "Argument not accepted: $1"
             exit 1
@@ -59,7 +64,7 @@ do
 done
 
 # Mamba
-setup_mamba $WORKSPACE/mambaforge "package-standalone" false ""
+setup_mamba $WORKSPACE/mambaforge "package-standalone" false $PLATFORM
 # Pin conda to known working version. In 24.9 the post-link.bat script doesn't work.
 mamba install --yes mamba=1.5 conda-build conda=24.7
 
@@ -77,11 +82,15 @@ PACKAGING_ARGS="-c ${LOCAL_CHANNEL}"
 if [ -n "${STANDALONE_PACKAGE_SUFFIX}" ]; then
     PACKAGING_ARGS="${PACKAGING_ARGS} -s ${STANDALONE_PACKAGE_SUFFIX}"
 fi
+
 if [[ $OSTYPE == 'msys'* ]]; then
     rm -fr *.exe
     ${PACKAGING_SCRIPTS_DIR}/win/create_package.sh $PACKAGING_ARGS
 elif [[ $OSTYPE == 'darwin'* ]]; then
     rm -fr *.dmg
+    if [ -n "${PLATFORM}" ]; then
+        PACKAGING_ARGS="${PACKAGING_ARGS} -p ${PLATFORM}"
+    fi
     ${PACKAGING_SCRIPTS_DIR}/osx/create_bundle.sh $PACKAGING_ARGS
 else
     rm -fr *.tar.xz

installers/conda/osx/create_bundle.sh

@@ -136,17 +136,22 @@ function usage() {
   echo "Options:"
   echo "  -c Optional Conda channel overriding the default mantid"
   echo "  -s Optional Add a suffix to the output mantid file, has to be Unstable, or Nightly or not used"
-  echo
+  echo "  -p Target platform, e.g. osx-64 or osx-arm64"
   exit $exitcode
 }
 
 ## Script begin
 # Optional arguments
 conda_channel=mantid
+platform=""
 suffix=
 while [ ! $# -eq 0 ]
 do
   case "$1" in
+    -p)
+        platform="$2"
+        shift
+        ;;
     -c)
         conda_channel="$2"
         shift
@@ -210,7 +215,7 @@ if [[ "$suffix" == "Unstable" ]] || [[ "$suffix" == "Nightly" ]]; then
 fi
 
 echo "Creating Conda environment in '$bundle_conda_prefix'"
-"$CONDA_EXE" create --quiet --prefix "$bundle_conda_prefix" --copy --platform osx-64 \
+"$CONDA_EXE" create --quiet --prefix "$bundle_conda_prefix" --copy --platform "$platform" \
   --channel "$conda_channel" --channel conda-forge --channel $mantid_channel --yes \
   mantidworkbench \
   jq  # used for processing the version string
@@ -240,6 +245,6 @@ create_plist "$bundle_contents" "$bundle_name" "$bundle_icon" "$version"
 # `create-dmg` returns error code by default due to lack of signing - this is suppressed using a command list.
 # Failure of the following `mv` command likely signifies `create-dmg` error.
 export PATH=$PATH:/opt/homebrew/bin/
-version_name="$bundle_name"-"$version"
+version_name="$bundle_name"-"$platform"-"$version"
 create-dmg "$BUILD_DIR"/"$bundle_dirname" || true
 mv "${bundle_name} ${version}.dmg" "${version_name}.dmg"