From 9406bce8755d1903fa423d9b39de091ae2875506 Mon Sep 17 00:00:00 2001
From: Andrew Kahr <22359829+AndrewKahr@users.noreply.github.com>
Date: Thu, 7 Dec 2023 22:13:03 -0800
Subject: [PATCH] Search legacy path for android sdkmanager. Add 2023.2 to
 tests (#606)

---
 .github/workflows/build-tests-mac.yml     | 1 +
 .github/workflows/build-tests-ubuntu.yml  | 1 +
 .github/workflows/build-tests-windows.yml | 1 +
 dist/platforms/ubuntu/entrypoint.sh       | 8 ++++++--
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-tests-mac.yml b/.github/workflows/build-tests-mac.yml
index d4c4bf5df..e6ba3fbf5 100644
--- 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
index 1fbb12e99..830d19218 100644
--- 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
index 173b8e9e6..da3389033 100644
--- 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
index 8b4fd2a76..914fd124f 100755
--- 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