Xcode version in environment

Xcode version in environment

Author: jordywitteman

.github/workflows/build_pkg_beta.yml

@@ -79,7 +79,7 @@ jobs:
           # Set Xcode version to latest version available
           # XCODE_VERSION=$(ls -d /Applications/Xcode*.app 2>/dev/null | sort -V | tail -n 1)
           # echo "Path to latest Xcode version: ${XCODE_VERSION}"
-          XCODE_VERSION="/Applications/Xcode_16.app"
+          XCODE_VERSION="${{env.XCODE_VERSION}}"
 
           # Select Xcode version
           sudo xcode-select -s "${XCODE_VERSION}"
@@ -91,7 +91,7 @@ jobs:
 
       - name: Notarize and package macOS app
         run: 
-          ./build_pkg_automated.zsh "${{env.APP_VERSION}}" "${{ secrets.APPLE_ID }}" "${{ secrets.APPLE_ID_APP_SPECIFIC_PASSWORD }}"
+          ./build_pkg_automated.zsh "${{env.APP_VERSION}}" "${{ secrets.APPLE_ID }}" "${{ secrets.APPLE_ID_APP_SPECIFIC_PASSWORD }}" "${{env.XCODE_VERSION}}"
 
       - name: Upload package
         uses: actions/upload-artifact@v4

.github/workflows/build_pkg_release_manual.yml

@@ -48,7 +48,7 @@ jobs:
           # Set Xcode version to latest version available
           # XCODE_VERSION=$(ls -d /Applications/Xcode*.app 2>/dev/null | sort -V | tail -n 1)
           # echo "Path to latest Xcode version: ${XCODE_VERSION}"
-          XCODE_VERSION="/Applications/Xcode_16.app"
+          XCODE_VERSION="${{env.XCODE_VERSION}}"
 
           # Select Xcode version
           sudo xcode-select -s "${XCODE_VERSION}"
@@ -60,7 +60,7 @@ jobs:
 
       - name: Notarize and package macOS app
         run: 
-          ./build_pkg_automated.zsh "${{env.APP_VERSION}}" "${{ secrets.APPLE_ID }}" "${{ secrets.APPLE_ID_APP_SPECIFIC_PASSWORD }}"
+          ./build_pkg_automated.zsh "${{env.APP_VERSION}}" "${{ secrets.APPLE_ID }}" "${{ secrets.APPLE_ID_APP_SPECIFIC_PASSWORD }}" "${{env.XCODE_VERSION}}"
 
       - name: Upload package
         uses: actions/upload-artifact@v4

build_pkg_automated.zsh

@@ -34,6 +34,9 @@ apple_id=$2
 # Apple ID password
 apple_id_app_specific_password=$3
 
+# Xcode version
+xcode_version=$4
+
 # App Name
 app_name="Support"
 
@@ -66,11 +69,6 @@ keychain_profile="Root3"
 
 # ---------------------    do not edit below this line    ----------------------
 
-# Set Xcode version to latest version available
-# xcode_version=$(ls -d /Applications/Xcode*.app 2>/dev/null | sort -V | tail -n 1)
-# echo "Path to latest Xcode version: ${xcode_version}"
- xcode_version="/Applications/Xcode_16.app"
-
 # Create directory
 mkdir -p "${current_directory}/${app_name}"
 
@@ -84,6 +82,7 @@ fi
 cp -r "${current_directory}/build/${app_name}.app" "${payload}"
 
 # Set credentials for notarization
+echo "Xcode version: ${xcode_version}"
 "${xcode_version}/Contents/Developer/usr/bin/notarytool" store-credentials --apple-id "${apple_id}" --team-id "98LJ4XBGYK" --password "${apple_id_app_specific_password}" "${keychain_profile}"
 
 # Build and sign pkg