Integration Test CI enables windows OS building Android Testapps (#134)

Author: sunmou99

scripts/gha/build_testapps.py

@@ -112,6 +112,7 @@
 from integration_testing import unity_finder
 from integration_testing import unity_version
 from integration_testing import xcodebuild
+from print_matrix_configuration import UNITY_SETTINGS
 
 # Used in specifying whether xcodebuild should build for device or simulator
 _DEVICE_REAL = "real"
@@ -469,8 +470,9 @@ def build_testapp(dir_helper, api_config, ios_config, target):
 
 def patch_android_env(unity_version):
   major_version = int(unity_version.split(".")[0])
-  if major_version >= 2019:
-    url = "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip"
+  # Set ndk env
+  if UNITY_SETTINGS[str(major_version)][get_desktop_platform()]["ndk"]:
+    url = UNITY_SETTINGS[str(major_version)][get_desktop_platform()]["ndk"]
     logging.info("install ndk: %s", url)
     ndk_zip_path = "ndk_zip"
     ndk_path = "ndk"
@@ -486,9 +488,9 @@ def patch_android_env(unity_version):
     try:
       # This is a bug from Unity: 
       # https://issuetracker.unity3d.com/issues/android-android-build-fails-when-targeting-sdk-31-and-using-build-tools-31-dot-0-0
-      _run([os.environ["ANDROID_HOME"]+"/tools/bin/sdkmanager", "--uninstall", "build-tools;31.0.0"])
+      _run([os.environ["ANDROID_HOME"]+"/tools/bin/sdkmanager", "--uninstall", "build-tools;31.0.0"], check=False)
       logging.info("Uninstall Android build tool 31.0.0")
-    except(subprocess.SubprocessError, RuntimeError) as e:
+    except Exception as e:
       logging.info(str(e))
 
   os.environ["UNITY_ANDROID_SDK"]=os.environ["ANDROID_HOME"]

scripts/gha/print_matrix_configuration.py

@@ -85,11 +85,13 @@
   "2020": {
     _WINDOWS: {
       "version": "2020.3.22f1",
-      "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": None, "macOS": ["Mac-mono"], "Linux": ["Linux-mono"]}
+      "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": None, "macOS": ["Mac-mono"], "Linux": ["Linux-mono"]},
+      "ndk": "https://dl.google.com/android/repository/android-ndk-r19-windows-x86_64.zip"
     },
     _MACOS: {
       "version": "2020.3.22f1",
-      "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-mono"], "macOS": None, "Linux": ["Linux-mono"]}
+      "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-mono"], "macOS": None, "Linux": ["Linux-mono"]},
+      "ndk": "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip"
     },
     _LINUX: {
       "version": "2020.3.22f1",
@@ -99,11 +101,13 @@
   "2019": {
     _WINDOWS: {
       "version": "2019.4.32f1",
-      "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": None, "macOS": ["Mac-mono"], "Linux": ["Linux-mono"]}
+      "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": None, "macOS": ["Mac-mono"], "Linux": ["Linux-mono"]},
+      "ndk": "https://dl.google.com/android/repository/android-ndk-r19-windows-x86_64.zip"
     },
     _MACOS: {
       "version": "2019.4.32f1",
-      "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-mono"], "macOS": None, "Linux": ["Linux-mono"]}
+      "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-mono"], "macOS": None, "Linux": ["Linux-mono"]},
+      "ndk": "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip"
     },
     _LINUX: {
       "version": "2019.4.33f1",
@@ -113,11 +117,13 @@
   "2018": {
     _WINDOWS: {
       "version": "2018.4.36f1",
-      "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-il2cpp"], "macOS": ["Mac-mono"], "Linux": ["Linux"]}
+      "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-il2cpp"], "macOS": ["Mac-mono"], "Linux": ["Linux"]},
+      "ndk": "https://dl.google.com/android/repository/android-ndk-r16b-windows-x86_64.zip"
     },
     _MACOS: {
       "version": "2018.4.36f1",
-      "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-mono"], "macOS": ["Mac-il2cpp"], "Linux": ["Linux"]}
+      "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-mono"], "macOS": ["Mac-il2cpp"], "Linux": ["Linux"]},
+      "ndk": "https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip"
     },
     _LINUX: {
       "version": "2018.4.36f1",
@@ -127,11 +133,13 @@
   "2017": {
     _WINDOWS: {
       "version": "2017.4.40f1",
-      "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": None, "macOS": ["Mac"], "Linux": ["Linux"]}
+      "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": None, "macOS": ["Mac"], "Linux": ["Linux"]},
+      "ndk": ""
     },
     _MACOS: {
       "version": "2017.4.40f1",
-      "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows"], "macOS": None, "Linux": ["Linux"]}
+      "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows"], "macOS": None, "Linux": ["Linux"]},
+      "ndk": ""
     },
     _LINUX: {
       "version": "2017.4.10f1",