Compare commits

...

1 Commits

Author SHA1 Message Date
Andrew Kahr 9406bce875 Search legacy path for android sdkmanager. Add 2023.2 to tests (#606) 2023-12-07 22:13:03 -08:00
4 changed files with 9 additions and 2 deletions
+1
View File
@@ -21,6 +21,7 @@ jobs:
- 2021.3.32f1 - 2021.3.32f1
- 2022.3.13f1 - 2022.3.13f1
- 2023.1.19f1 - 2023.1.19f1
- 2023.2.2f1
targetPlatform: targetPlatform:
- StandaloneOSX # Build a MacOS executable - StandaloneOSX # Build a MacOS executable
- iOS # Build an iOS executable - iOS # Build an iOS executable
+1
View File
@@ -50,6 +50,7 @@ jobs:
- 2021.3.32f1 - 2021.3.32f1
- 2022.3.13f1 - 2022.3.13f1
- 2023.1.19f1 - 2023.1.19f1
- 2023.2.2f1
targetPlatform: targetPlatform:
- StandaloneOSX # Build a macOS standalone (Intel 64-bit) with mono backend. - StandaloneOSX # Build a macOS standalone (Intel 64-bit) with mono backend.
- StandaloneWindows64 # Build a Windows 64-bit standalone with mono backend. - StandaloneWindows64 # Build a Windows 64-bit standalone with mono backend.
@@ -21,6 +21,7 @@ jobs:
- 2021.3.32f1 - 2021.3.32f1
- 2022.3.13f1 - 2022.3.13f1
- 2023.1.19f1 - 2023.1.19f1
- 2023.2.2f1
targetPlatform: targetPlatform:
- Android # Build an Android apk. - Android # Build an Android apk.
- StandaloneWindows64 # Build a Windows 64-bit standalone. - StandaloneWindows64 # Build a Windows 64-bit standalone.
+4
View File
@@ -18,10 +18,14 @@ if [[ "$BUILD_TARGET" == "Android" ]]; then
ANDROID_HOME_DIRECTORY="$(awk -F'=' '/ANDROID_HOME=/{print $2}' /usr/bin/unity-editor.d/*)" ANDROID_HOME_DIRECTORY="$(awk -F'=' '/ANDROID_HOME=/{print $2}' /usr/bin/unity-editor.d/*)"
SDKMANAGER=$(find $ANDROID_HOME_DIRECTORY/cmdline-tools -name sdkmanager) SDKMANAGER=$(find $ANDROID_HOME_DIRECTORY/cmdline-tools -name sdkmanager)
if [ -z "${SDKMANAGER}" ] if [ -z "${SDKMANAGER}" ]
then
SDKMANAGER=$(find $ANDROID_HOME_DIRECTORY/tools/bin -name sdkmanager)
if [ -z "${SDKMANAGER}" ]
then then
echo "No sdkmanager found" echo "No sdkmanager found"
exit 1 exit 1
fi fi
fi
if [[ -n "$ANDROID_SDK_MANAGER_PARAMETERS" ]]; then if [[ -n "$ANDROID_SDK_MANAGER_PARAMETERS" ]]; then
echo "Updating Android SDK with parameters: $ANDROID_SDK_MANAGER_PARAMETERS" echo "Updating Android SDK with parameters: $ANDROID_SDK_MANAGER_PARAMETERS"