clean up script files location (#369)

Author: cynthiajoan

.github/workflows/build_starter.yml

@@ -214,7 +214,7 @@ jobs:
 
   trigger_reusable_package:
     name: package ${{ needs.check_and_prepare.outputs.release_label }}
-    needs: [build_android, build_ios, build_linux, build_macos, build_windows, decide_build_branch]
+    needs: [check_and_prepare, build_android, build_ios, build_linux, build_macos, build_windows, decide_build_branch]
     uses: ./.github/workflows/package.yml
     if: (needs.check_and_prepare.outputs.should_trigger_package == 'true') && !cancelled() && !failure()
     with:
@@ -223,4 +223,6 @@ jobs:
       skipIntegrationTests: ${{ needs.check_and_prepare.outputs.skipIntegrationTests }}
       build_run_id: ${{ github.run_id }}
       working_branch: ${{ needs.decide_build_branch.outputs.build_branch }}
+      platforms: ${{ needs.check_and_prepare.outputs.platform }}
+      apis: ${{ needs.check_and_prepare.outputs.apis }}
     secrets: inherit

.github/workflows/package.yml

@@ -31,6 +31,16 @@ on:
         description: 'run id for build_starter.yml, search for all output'
         required: false
         type: string
+      platforms:
+        description: 'CSV of Android,iOS,Windows,macOS,Linux,Playmode'
+        default: 'Android,iOS,Windows,macOS,Linux,Playmode'
+        required: true
+        type: string
+      apis:
+        description: 'CSV of apis to build and test'
+        default: 'analytics,auth,crashlytics,database,dynamic_links,firestore,functions,installations,messaging,remote_config,storage'
+        required: true
+        type: string
 
   workflow_dispatch:
     inputs:
@@ -81,6 +91,8 @@ jobs:
       fail-fast: false
     outputs:
       skipIntegrationTests: ${{ steps.decide_input.outputs.skipIntegrationTests }}
+      platforms: ${{ steps.decide_input.outputs.platforms }}
+      apis: ${{ steps.decide_input.outputs.apis }}
     steps:
       - name: Decide inputs
         id: decide_input
@@ -99,6 +111,8 @@ jobs:
             echo "::set-output name=download_linux_run::${{ inputs.build_run_id }}"
             echo "::set-output name=download_macos_run::${{ inputs.build_run_id }}"
             echo "::set-output name=download_windows_run::${{ inputs.build_run_id }}"
+            echo "::set-output name=platforms::${{ inputs.platforms }}"
+            echo "::set-output name=apis::${{ inputs.apis }}"
           else
             echo "::set-output name=use_new_build::${{ github.event.inputs.use_new_build }}"
             echo "::set-output name=workflow_conclusion::success"
@@ -111,6 +125,8 @@ jobs:
             echo "::set-output name=download_linux_run::${{ github.event.inputs.download_linux_run }}"
             echo "::set-output name=download_macos_run::${{ github.event.inputs.download_macos_run }}"
             echo "::set-output name=download_windows_run::${{ github.event.inputs.download_windows_run }}"
+            echo "::set-output name=platforms::Android,iOS,Windows,macOS,Linux,Playmode"
+            echo "::set-output name=apis::analytics,auth,crashlytics,database,dynamic_links,firestore,functions,installations,messaging,remote_config,storage"
           fi
 
       - name: Print inputs
@@ -128,6 +144,8 @@ jobs:
           echo download_linux_run: ${{ steps.decide_input.outputs.download_linux_run }}
           echo download_macos_run: ${{ steps.decide_input.outputs.download_macos_run }}
           echo download_windows_run: ${{ steps.decide_input.outputs.download_windows_run }}
+          echo platforms: ${{ steps.decide_input.outputs.platforms }}"
+          echo apis: ${{ steps.decide_input.outputs.apis }}"
 
       - name: Check out base branch
         uses: actions/[email protected]
@@ -301,7 +319,7 @@ jobs:
 
       - name: Package unitypackage
         run: |
-          python build_package.py --zip_dir=built_artifact
+          python scripts/build_scripts/build_package.py --zip_dir=built_artifact
 
       - name: Commit Changes if there is any
         if: steps.decide_input.outputs.working_branch != '' || steps.decide_input.outputs.create_new_branch == '1'
@@ -377,7 +395,7 @@ jobs:
 
       - name: Package tgz
         run: |
-          python build_package.py --zip_dir=built_artifact --output_upm=True --output=output_tgz
+          python scripts/build_scripts/build_package.py --zip_dir=built_artifact --output_upm=True --output=output_tgz
 
       - name: Listing output tgz
         run: |
@@ -440,6 +458,10 @@ jobs:
           generate_report=(-p test_pull_request nightly-packaging)
         fi
         set -e
-        python scripts/gha/trigger_workflow.py -t ${{ steps.generate-token.outputs.token }} -w integration_tests.yml -p test_packaged_sdk ${{ github.run_id }} -s 10 -A -v
-       
-    
+        python scripts/gha/trigger_workflow.py \
+          -t ${{ steps.generate-token.outputs.token }} \
+          -w integration_tests.yml \
+          -p test_packaged_sdk ${{ github.run_id }} \
+          -p platforms ${{ needs.package_sdks.outputs.platforms }} \
+          -p apis ${{ needs.package_sdks.outputs.apis }} \
+          -s 10 -A -v

README.md

@@ -20,8 +20,8 @@ directories to your PATH as needed.
 
 - [CMake](https://cmake.org/) version 3.13.3, or newer.
 - [Mono](https://www.mono-project.com/) version 5 or newer.
-- [Unity](https://unity.com/) version 5 or newer.
-- [Swig3](http://www.swig.org/) version 3.0.6 or newer (Not version 4 though).
+- [Unity](https://unity.com/) version 2019 or newer.
+- [Swig](http://www.swig.org/) version 4 or newer.
 
 ### Prerequisites for Windows
 On windows, to work around path length issues with google unity resolver enable
@@ -38,8 +38,6 @@ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/
 source $HOME/.rvm/scripts/rvm
 brew install cmake protobuf python mono swig
 sudo chown -R $(whoami) /usr/local
-
-export PATH="/usr/local/opt/swig@3/bin:$PATH"
 ```
 
 ## Building

build_package.py renamed to scripts/build_scripts/build_package.py

@@ -27,17 +27,14 @@
   * ...
 
 Example usage:
-  python build_package.py --zip_dir=<assets_zip_dir>
+  python scripts/build_scripts/build_package.py --zip_dir=<assets_zip_dir>
 """
-import collections
-import json
 import os
 import sys
 import subprocess
 import zipfile
 import shutil
 
-from github import Github
 from absl import app
 from absl import flags
 from absl import logging
@@ -174,7 +171,7 @@ def main(argv):
     error_str = error_str.rstrip("\\n\'")
     split_string = error_str.split(" ")
     split_string = split_string[3:] # exclude first 3 lines
-    gen_guids_script_path = os.path.join(os.getcwd(), "gen_guids.py")
+    gen_guids_script_path = os.path.join(os.getcwd(), "scripts", "build_scripts", "gen_guids.py")
     gen_cmd_args = [
       sys.executable,
       gen_guids_script_path,

gen_guids.py renamed to scripts/build_scripts/gen_guids.py

@@ -18,7 +18,7 @@
 """Unpack Unity SDK package file.
 
 Example usage:
-  python unpack_package.py --folder=<sdk folder 1>
+  python scripts/build_scripts/unpack_package.py --folder=<sdk folder 1>
 """
 
 import os

gen_guids_test.py renamed to scripts/build_scripts/gen_guids_test.py

@@ -23,14 +23,14 @@
 specified by a flag (home directory, by default).
 
 Build these two testapps for the two given Unity versions:
-$ build_testapps.py --t auth,storage --u 2017.4.37f1
+$ build_testapps.py --t auth,storage --u 2019.4.39f1
 
 Build auth for 2017.4, using the latest .NET runtime (4.6). Normally the
 default runtime for that version of Unity will be used.
-$ build_testapps.py --t auth --u 2017.4.37f1 --force_latest_runtime
+$ build_testapps.py --t auth --u 2019.4.39f1 --force_latest_runtime
 
-Build all APIs for 2017.4.37f1.
-$ build_testapps.py --u 2017.4.37f1
+Build all APIs for 2019.4.39f1.
+$ build_testapps.py --u 2019.4.39f1
 
 IN-EDITOR TESTING:
 
@@ -91,6 +91,7 @@
 
 import datetime
 from distutils import dir_util
+from genericpath import isdir
 import glob
 import os
 import platform
@@ -173,7 +174,7 @@
     short_name="t")
 
 flags.DEFINE_list(
-    "unity_versions", "2017.4.37f1",
+    "unity_versions", "2019.4.39f1",
     "Unity versions to build against. Must match the folder name in your"
     " applications directory or Unity Hub subdirectory.",
     short_name="u")
@@ -509,8 +510,16 @@ def patch_android_env(unity_version):
         fd.write(chunk)
     with zipfile.ZipFile(ndk_zip_path, 'r') as zip_ref:
         zip_ref.extractall(ndk_path)
-    os.environ["ANDROID_NDK_HOME"] = os.path.abspath(os.path.join(ndk_path, "android-ndk-r19"))
-    logging.info("set ANDROID_NDK_HOME: %s", os.environ["ANDROID_NDK_HOME"])
+    ndk_direct_folder = ""
+    for subfolder in os.listdir(ndk_path):
+      if subfolder.startswith("android-ndk-"):
+        ndk_direct_folder = subfolder
+        break
+    if ndk_direct_folder:
+      os.environ["ANDROID_NDK_HOME"] = os.path.abspath(os.path.join(ndk_path, ndk_direct_folder))
+      logging.info("set ANDROID_NDK_HOME: %s", os.environ["ANDROID_NDK_HOME"])
+    else:
+      logging.warning("No valid android folder unzipped from url %s, ANDROID_NDK_HOME not overwritten", url) 
   if major_version >= 2020:
     try:
       # This is a bug from Unity: 

unpack_package.py renamed to scripts/build_scripts/unpack_package.py

@@ -34,7 +34,8 @@
 
 FLAGS = flags.FLAGS
 flags.DEFINE_string("unity_sdk_version", None,
-                    "Required, will check and upgrade cmake/firebase_unity_version.cmake")
+                    "Required, will check and upgrade cmake/firebase_unity_version.cmake",
+                    short_name="u")
 
 def get_latest_repo_tag(repo_url):
   repo = Github().get_repo(repo_url)
@@ -200,6 +201,19 @@ def update_unity_version(unity_sdk_version):
   with open(version_cmake_path, "w") as fout:
     fout.write(replacement)
 
+def update_readme(unity_sdk_version):
+  readme_path = os.path.join(os.getcwd(), "docs", "readme.md")
+  replacement = ""
+  with open(readme_path, "r") as f:
+    replacement = f.read()
+    if "### Upcoming Release" in replacement:
+      replacement = replacement.replace("### Upcoming Release", "### "+unity_sdk_version)
+    else:
+      logging.warning("No upcoming release defined in docs/readme.md")
+
+  with open(readme_path, "w") as fout:
+    fout.write(replacement)
+
 def main(argv):
   if len(argv) > 1:
     raise app.UsageError('Too many command-line arguments.')
@@ -209,6 +223,7 @@ def main(argv):
 
   update_unity_version(FLAGS.unity_sdk_version)
   update_android_deps()
+  update_readme(FLAGS.unity_sdk_version)
 
 if __name__ == '__main__':
   app.run(main)