Fix the package logic, and add windows build python logic (#250)

Co-authored-by: Cynthia Jiang <[email protected]>

Author: cynthiajoan

.github/workflows/android.yml

@@ -18,6 +18,7 @@ on:
 
 jobs:
   build_android:
+    name: build-android-macos-${{ github.event.inputs.unity_version }}-CPP${{ github.event.inputs.firebase_cpp_sdk_version }}
     runs-on: macos-latest
     strategy:
       fail-fast: false

.github/workflows/ios.yml

@@ -19,6 +19,7 @@ on:
 
 jobs:
   build_ios:
+    name: build-ios-macos-${{ github.event.inputs.unity_version }}-CPP${{ github.event.inputs.firebase_cpp_sdk_version }}
     runs-on: macos-latest
     strategy:
       fail-fast: false

.github/workflows/package.yml

@@ -11,17 +11,34 @@ on:
       skipIntegrationTests:
         description: 'skip integration tests?'
         default: 0
+        required: false
+      create_new_branch:
+        description: 'If we need to create new branch to package guids update. 0 means no creation and 1 means create. If working_branch set, will ignore this value. '
+        default: 0
+        required: false
       working_branch:
         description: 'If already a working in progress release branch'
-        default: None
+        required: false
+      download_ios_run:
+        description: 'run id for ios.yml'
+        required: false
+      download_android_run:
+        description: 'run id for android.yml'
+        required: false
+      download_desktop_run:
+        description: 'run id for sdk_build.yml'
+        required: false
+      release_label:
+        description: 'If the package is intended to run for a release, put <version>-RC## for label'
+        required: false
 
 env:
   # Use SHA256 for hashing files.
   hashCommand: "sha256sum"
 
 jobs:
   package_sdks:
-    name: package-${{matrix.os}}
+    name: package-${{matrix.os}}-${{github.event.inputs.release_label}}
     runs-on: ${{matrix.os}}
     strategy:
       fail-fast: false
@@ -31,6 +48,17 @@ jobs:
         - os: ubuntu-latest
           package_dir: output
     steps:
+      - name: Print out inputs
+        shell: bash
+        run: |
+          echo operation_system: ${{ github.event.inputs.operating_systems }}
+          echo skipIntegrationTests: ${{ github.event.inputs.skipIntegrationTests }}
+          echo create_new_branch: ${{ github.event.inputs.create_new_branch }}
+          echo working_branch: ${{ github.event.inputs.working_branch }}
+          echo download_ios_run: ${{ github.event.inputs.download_ios_run }}
+          echo download_android_run: ${{ github.event.inputs.download_android_run }}
+          echo download_desktop_run: ${{ github.event.inputs.download_desktop_run }}
+
       - name: Check out base branch
         uses: actions/[email protected]
         with:
@@ -55,20 +83,20 @@ jobs:
           pip install -r scripts/gha/requirements.txt
 
       - name: Name new branch
-        if: github.event.inputs.working_branch == 'None'
+        if: github.event.inputs.working_branch == '' && github.event.inputs.create_new_branch == '1'
         run: |
           date_str=$(date "+%Y%m%d-%H%M%S")
-          echo "NEW_BRANCH=${{env.branchPrefix}}${{github.event.inputs.package_version_number}}-${date_str}" >> $GITHUB_ENV
+          echo "NEW_BRANCH=new_branch-${date_str}" >> $GITHUB_ENV
 
       - name: Create new branch
-        if: github.event.inputs.working_branch == 'None'
+        if: github.event.inputs.working_branch == '' && github.event.inputs.create_new_branch == '1'
         run: |
           git remote update
           git checkout -b "${NEW_BRANCH}"
           echo "UPDATE_LOGFILE=update_log.txt" >> $GITHUB_ENV
 
       - name: Checkout working branch
-        if: github.event.inputs.working_branch != 'None'
+        if: github.event.inputs.working_branch != ''
         run: |
           git remote update
           git checkout ${{ github.event.inputs.working_branch }}
@@ -80,21 +108,21 @@ jobs:
         uses: dawidd6/action-download-artifact@v2
         with:
           workflow: 'sdk_build.yml'
-          run_id: ${{ github.event.inputs.downloadPreviousRun }}
+          run_id: ${{ github.event.inputs.download_desktop_run }}
           path: built_artifect
 
       - name: Fetch iOS Artifacts
         uses: dawidd6/action-download-artifact@v2
         with:
           workflow: 'ios.yml'
-          run_id: ${{ github.event.inputs.downloadPreviousRun }}
+          run_id: ${{ github.event.inputs.download_ios_run }}
           path: built_artifect
 
       - name: Fetch Android Artifacts
         uses: dawidd6/action-download-artifact@v2
         with:
           workflow: 'android.yml'
-          run_id: ${{ github.event.inputs.downloadPreviousRun }}
+          run_id: ${{ github.event.inputs.download_android_run }}
           path: built_artifect
 
       - name: move zip files
@@ -129,7 +157,7 @@ jobs:
           fi
 
       - name: Create PR if there is None
-        if: github.event.inputs.working_branch == 'None'
+        if: github.event.inputs.working_branch == '' && github.event.inputs.create_new_branch == '1'
         id: push-branch
         run: |
           if ! git update-index --refresh; then

.github/workflows/sdk_build.yml

@@ -24,7 +24,7 @@ on:
 
 jobs:
   build_desktop:
-    name: build-desktop-${{matrix.os}}-${{matrix.unity_version}}
+    name: build-desktop-${{matrix.os}}-${{matrix.unity_version}}-CPP${{ github.event.inputs.firebase_cpp_sdk_version }}
     runs-on: ${{matrix.os}}
     strategy:
       fail-fast: false

.gitignore

@@ -22,6 +22,8 @@ gcs_key_file.json
 *_unity/
 *_unity_seperate/
 *_unity_separate/
+output/
+output_unpack*/
 
 # Windows ignore
 vcpkg

cmake/build_shared.cmake

@@ -83,6 +83,7 @@ function(build_firebase_shared LIBRARY_NAME ARTIFACT_NAME OUTPUT_NAME)
     set_target_properties(${shared_target}
       PROPERTIES
         PREFIX "lib"
+        # SUFFIX default is ".so"
     )
   else()
     set_target_properties(${shared_target}

scripts/build_scripts/build_zips.py

@@ -25,6 +25,7 @@
 import subprocess
 import zipfile
 import tempfile
+import sys
 
 from absl import app, flags, logging
 
@@ -270,6 +271,7 @@ def get_android_args():
   result_args.append("-DFIREBASE_ANDROID_BUILD=true")
   # android default to build release.
   result_args.append("-DCMAKE_BUILD_TYPE=release")
+  result_args.append("-DANDROID_STL=c++_shared")
   return result_args
 
 
@@ -350,6 +352,17 @@ def make_android_multi_arch_build(cmake_args, merge_script):
   logging.info("Generated Android multi-arch (%s) zip %s",
                ",".join(g_mobile_target_architectures), final_zip_path)
 
+def get_windows_args():
+  """Get the cmake args for windows platform specific.
+
+    Returns:
+      camke args for windows platform.
+  """
+  result_args = []
+  result_args.append('-G \"Visual Studio 16 2019\"')
+  result_args.append('-A x64') # TODO flexibily for x32
+  result_args.append("-DFIREBASE_PYTHON_HOST_EXECUTABLE:FILEPATH=%s" % sys.executable)
+  return result_args    
 
 def is_android_build():
   """
@@ -366,6 +379,13 @@ def is_ios_build():
   """
   return FLAGS.platform == "ios"
 
+def is_windows_build():
+  """
+    Returns:
+      If the build platform is windows
+  """
+  return FLAGS.platform == "windows"
+
 
 def main(argv):
   if len(argv) > 1:
@@ -411,6 +431,8 @@ def main(argv):
     cmake_setup_args.extend(get_ios_args(source_path))
   elif is_android_build():
     cmake_setup_args.extend(get_android_args())
+  elif is_windows_build():
+    cmake_setup_args.extend(get_windows_args())
 
   global g_mobile_target_architectures
   logging.info("cmake_setup_args is: " + " ".join(cmake_setup_args))