Merge commit '9406bce8755d1903fa423d9b39de091ae2875506' into cloud-ru…

…nner-develop
game-ci · Dec 11, 2023 · 51919eb · 51919eb
2 parents 5d52c1d + 9406bce
commit 51919eb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/build-tests-mac.yml b/.github/workflows/build-tests-mac.yml
@@ -21,6 +21,7 @@ jobs:
           - 2021.3.32f1
           - 2022.3.13f1
           - 2023.1.19f1
+          - 2023.2.2f1
         targetPlatform:
           - StandaloneOSX # Build a MacOS executable
           - iOS # Build an iOS executable

diff --git a/.github/workflows/build-tests-ubuntu.yml b/.github/workflows/build-tests-ubuntu.yml
@@ -50,6 +50,7 @@ jobs:
           - 2021.3.32f1
           - 2022.3.13f1
           - 2023.1.19f1
+          - 2023.2.2f1
         targetPlatform:
           - StandaloneOSX # Build a macOS standalone (Intel 64-bit) with mono backend.
           - StandaloneWindows64 # Build a Windows 64-bit standalone with mono backend.

diff --git a/.github/workflows/build-tests-windows.yml b/.github/workflows/build-tests-windows.yml
@@ -21,6 +21,7 @@ jobs:
           - 2021.3.32f1
           - 2022.3.13f1
           - 2023.1.19f1
+          - 2023.2.2f1
         targetPlatform:
           - Android # Build an Android apk.
           - StandaloneWindows64 # Build a Windows 64-bit standalone.

diff --git a/dist/platforms/ubuntu/entrypoint.sh b/dist/platforms/ubuntu/entrypoint.sh
@@ -19,8 +19,12 @@ if [[ "$BUILD_TARGET" == "Android" ]]; then
   SDKMANAGER=$(find $ANDROID_HOME_DIRECTORY/cmdline-tools -name sdkmanager)
   if [ -z "${SDKMANAGER}" ]
   then
-    echo "No sdkmanager found"
-    exit 1
+    SDKMANAGER=$(find $ANDROID_HOME_DIRECTORY/tools/bin -name sdkmanager)
+    if [ -z "${SDKMANAGER}" ]
+    then
+      echo "No sdkmanager found"
+      exit 1
+    fi
   fi
 
   if [[ -n "$ANDROID_SDK_MANAGER_PARAMETERS" ]]; then