Merge pull request #105 from firebase/fix-firestore

Create update_version workflow

Author: cynthiajoan

.github/workflows/android.yml

@@ -12,6 +12,9 @@ on:
         description: 'Firebase CPP SDK version to build against (The branch, tag or SHA to checkout)'
         default: ''
         required: false
+      unity_branch:
+        description: 'Unity branch to build against, empty means current branch'
+        default: ''
 
 jobs:
   build_android:
@@ -30,6 +33,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: true
+          ref: ${{ github.event.inputs.unity_branch }}
 
       - name: Checkout CPP Repo
         uses: actions/checkout@v2

.github/workflows/ios.yml

@@ -13,6 +13,9 @@ on:
         description: 'Firebase CPP SDK version to build against (The branch, tag or SHA to checkout)'
         default: ''
         required: false
+      unity_branch:
+        description: 'Unity branch to build against, empty means current branch'
+        default: ''
 
 jobs:
   build_ios:
@@ -31,6 +34,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: true
+          ref: ${{ github.event.inputs.unity_branch }}
 
       - name: Checkout CPP Repo
         uses: actions/checkout@v2

.github/workflows/package.yml

@@ -24,8 +24,18 @@ jobs:
         - os: ubuntu-latest
           package_dir: output
     steps:
-      - name: fetch SDK
+      - name: Check out base branch
         uses: actions/[email protected]
+        with:
+          fetch-depth: 0
+          ref: ${{ github.event.inputs.baseBranch }}
+      
+      - name: Get token for firebase-workflow-trigger
+        uses: tibdex/github-app-token@v1
+        id: generate-token
+        with:
+          app_id: ${{ secrets.WORKFLOW_TRIGGER_APP_ID }}
+          private_key: ${{ secrets.WORKFLOW_TRIGGER_APP_PRIVATE_KEY }}
 
       - name: Setup Python
         uses: actions/setup-python@v2
@@ -37,6 +47,19 @@ jobs:
         run: |
           pip install -r scripts/gha/requirements.txt
 
+      - name: Name new branch
+        if: github.event.inputs.package_version_number != 0
+        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
+
+      - name: Create new branch
+        if: github.event.inputs.package_version_number != 0
+        run: |
+          git remote update
+          git checkout -b "${NEW_BRANCH}"
+          echo "UPDATE_LOGFILE=update_log.txt" >> $GITHUB_ENV
+
       # Fetch all the zip files from previous run
       - name: Fetch Desktop Artifacts
         uses: dawidd6/action-download-artifact@v2
@@ -59,6 +82,47 @@ jobs:
           run_id: ${{ github.event.inputs.downloadPreviousRun }}
           path: built_artifect
 
+      # - name: Update Guids Json
+      #   if: github.event.inputs.package_version_number != 0
+      #   run: |
+
+      - name: Push branch if there are changes
+        id: push-branch
+        run: |
+          cd firebase-unity-sdk
+          if ! git update-index --refresh; then
+            date_str=$(date "+%a %b %d %Y")
+            commit_title="Update Unity SDK dependencies - ${date_str}"
+            commit_body=
+            if [[ -n '${{ github.event.inputs.comment }}' ]]; then
+              # If a comment was provided, start with that instead of blank.
+              commit_body='${{ github.event.inputs.comment }}
+
+            '
+            fi
+
+            commit_body="${commit_body}
+
+          > Created by [${{github.workflow}} workflow]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID)."
+            git config user.email "[email protected]"
+            git config user.name "firebase-workflow-trigger-bot"
+            git config core.commentChar "%"  # so we can use # in git commit messages
+            git commit -a -m "${commit_title}
+
+          ${commit_body}"
+            echo "::set-output name=branch_pushed::1"
+            # Show changes in git log
+            git diff
+            # Push branch
+            git push --set-upstream origin "${NEW_BRANCH}"
+            # Create pull request
+            pr_number=$(python scripts/gha/create_pull_request.py --token ${{ steps.generate-token.outputs.token }} --head "${NEW_BRANCH}" --base "${{ github.event.inputs.baseBranch }}" --title "${commit_title}" --body "${commit_body}")
+            echo "::set-output name=created_pr_number::${pr_number}"
+          else
+            echo "::warning ::No changes detected, won't create pull request."
+            echo "::set-output name=branch_pushed::0"
+          fi
+
       - name: move zip files
         run: |
           cd built_artifect

.github/workflows/sdk_build.yml

@@ -14,6 +14,9 @@ on:
         description: 'Additional flags to pass into CMake'
         default: ''
         required: false
+      unity_branch:
+        description: 'Unity branch to build against, empty means current branch'
+        default: ''
 
 jobs:
   build_desktop:
@@ -45,6 +48,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
+          ref: ${{ github.event.inputs.unity_branch }}
 
       - uses: actions/checkout@v2
         with:

.github/workflows/update_versions.yml

@@ -8,13 +8,18 @@ on:
         description: 'CSV of VMs to run on'
         default: 'ubuntu-latest'
         required: true
+      baseBranch:
+        description: 'create the new branch from this base'
+        default: 'main'
       package_version_number:
         description: "The Unity SDK version to upgrade to"
         default: 8.6.0
 
 jobs:
   update_versions:
-    name: package-${{matrix.os}}
+    name: update-version-${{matrix.os}}
+    outputs:
+      new_branch: ${{ steps.name-branch.outputs.new_branch }}
     runs-on: ${{matrix.os}}
     strategy:
       fail-fast: false
@@ -39,9 +44,9 @@ jobs:
           ref: ${{ github.event.inputs.firebase_cpp_sdk_version }}
           submodules: true
 
-      - name: Get token for firebase-workflow-trigger
+      - name: Get token for creating PR 
         uses: tibdex/github-app-token@v1
-        id: generate-token
+        id: generate-pr-token
         with:
           app_id: ${{ secrets.WORKFLOW_TRIGGER_APP_ID }}
           private_key: ${{ secrets.WORKFLOW_TRIGGER_APP_PRIVATE_KEY }}
@@ -58,16 +63,20 @@ jobs:
           pip install -r scripts/gha/requirements.txt
 
       - name: Name new branch
+        id: name-branch
         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
+          new_branch=version-${{github.event.inputs.package_version_number}}-${date_str}
+          echo "NEW_BRANCH=${new_branch}" >> $GITHUB_ENV
+          echo "::set-output name=new_branch::${new_branch}"
 
       - name: Create new branch
         run: |
           cd firebase-unity-sdk
           git remote update
           git checkout -b "${NEW_BRANCH}"
           echo "UPDATE_LOGFILE=update_log.txt" >> $GITHUB_ENV
+          
 
       - name: Update Unity SDK version and dependencies
         run: |
@@ -104,15 +113,15 @@ jobs:
             # Push branch
             git push --set-upstream origin "${NEW_BRANCH}"
             # Create pull request
-            pr_number=$(python scripts/gha/create_pull_request.py --token ${{ steps.generate-token.outputs.token }} --head "${NEW_BRANCH}" --base "${{ github.event.inputs.baseBranch }}" --title "${commit_title}" --body "${commit_body}")
+            pr_number=$(python scripts/gha/create_pull_request.py --token ${{ steps.generate-pr-token.outputs.token }} --head "${NEW_BRANCH}" --base "${{ github.event.inputs.baseBranch }}" --title "${commit_title}" --body "${commit_body}")
             echo "::set-output name=created_pr_number::${pr_number}"
           else
             echo "::warning ::No changes detected, won't create pull request."
             echo "::set-output name=branch_pushed::0"
           fi
 
   trigger_build_sdks:
-    needs: [update_versions]
+    needs: update_versions
     name: trigger-build-${{matrix.platform}}
     runs-on: ubuntu-latest
     strategy:
@@ -130,6 +139,9 @@ jobs:
     steps:
       - name: Checkout repo
         uses: actions/[email protected]
+        with:
+          fetch-depth: 0
+          ref: ${{ github.event.inputs.baseBranch }}
 
       - name: Setup python
         uses: actions/setup-python@v2
@@ -144,7 +156,7 @@ jobs:
         # This method is preferred over the "personal access token" solution, as the GitHub App's scope is limited to just
         # the firebase-cpp-sdk repository.
         uses: tibdex/github-app-token@v1
-        id: generate-token
+        id: generate-build-token
         with:
           app_id: ${{ secrets.WORKFLOW_TRIGGER_APP_ID }}
           private_key: ${{ secrets.WORKFLOW_TRIGGER_APP_PRIVATE_KEY }}
@@ -158,4 +170,6 @@ 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 ${{ matrix.trigger_file }} -p test_packaged_sdk ${{ github.run_id }} -s 10 -A -v
+          compose_new_branch=firebase-unity-sdk/${{ needs.update_versions.outputs.new_branch }}
+          echo "New branch is: ${compose_new_branch}"
+          python scripts/gha/trigger_workflow.py -t ${{ steps.generate-build-token.outputs.token }} -w ${{ matrix.trigger_file }} -p unity_branch ${{ needs.update_versions.outputs.new_branch }}

build_package.py

@@ -38,6 +38,7 @@
 import zipfile
 import shutil
 
+from github import Github
 from absl import app
 from absl import flags
 from absl import logging
@@ -78,27 +79,19 @@ def get_zip_files():
 
   return zip_file_paths
 
-def get_last_version(guids_file):
+def get_last_version():
   """Get the last version number in guids file if exists.
-
-    Args:
-      guids_file: the file to look the version in.
-
     Returns:
       version number.
   """
-  json_dict = None
-  with open(guids_file, "rt") as json_file:
-    try:
-      json_dict = json.load(json_file,
-                             object_pairs_hook=collections.OrderedDict)
-    except ValueError as error:
-      raise ValueError("Failed to load JSON file %s (%s)" % (guids_file,
-                                                             str(error)))
-  if json_dict:
-    key_list = list(json_dict.keys())
-    key_list.sort(key=lambda s: list(map(int, s.split('.'))))
-    return key_list[-1]
+  version_cmake_path = os.path.join(os.getcwd(), "cmake", "firebase_unity_version.cmake")
+  with open(version_cmake_path, "r") as f:
+    datafile = f.readlines()
+    for line in datafile:
+      if "FIREBASE_UNITY_SDK_VERSION" in line:
+        result = line.split()
+        return result[-1].strip("\"")
+  return None
 
 def find_pack_script():
   """Get the pack script either from intermediate build folder or download from unity-jar-resolver.
@@ -135,12 +128,15 @@ def main(argv):
   packer_script_path = find_pack_script()
   if packer_script_path == None:
     raise app.UsageError('Cannot find pack script. Please build the project first.')
-
+   
   packer_script_path = os.path.join(os.getcwd(), packer_script_path)
   config_file_path = os.path.join(os.getcwd(), FLAGS.script_folder,
                                   FLAGS.config_file)
   guids_file_path = os.path.join(os.getcwd(), FLAGS.script_folder,
                                  FLAGS.guids_file)
+
+  last_version = get_last_version()
+
   zip_file_list = get_zip_files()
 
   if not zip_file_list:
@@ -160,7 +156,7 @@ def main(argv):
       "--output_upm=" + str(FLAGS.output_upm),
   ]
   cmd_args.extend(["--assets_zip=" + zip_file for zip_file in zip_file_list])
-  last_version = get_last_version(guids_file_path)
+  
   if last_version:
     cmd_args.append("--plugins_version=" + last_version)
 
@@ -172,6 +168,5 @@ def main(argv):
 
   return subprocess.call(cmd_args)
 
-
 if __name__ == '__main__':
   app.run(main)

cmake/firebase_unity_version.cmake

@@ -17,19 +17,17 @@
 set(FIREBASE_UNITY_SDK_VERSION "8.5.0"
     CACHE STRING "The version of the Unity SDK, used in the names of files.")
 
-set(FIREBASE_IOS_POD_VERSION "8.3.0"
+set(FIREBASE_IOS_POD_VERSION "8.9.0"
     CACHE STRING "The version of the top-level Firebase Cocoapod to use.")
 
 # https://github.com/googlesamples/unity-jar-resolver
-set(FIREBASE_UNITY_JAR_RESOLVER_VERSION
-  "1.2.167"
+set(FIREBASE_UNITY_JAR_RESOLVER_VERSION "1.2.167"
    CACHE STRING
   "Version tag of Play Services Resolver to download and use (no trailing .0)"
 )
 
 # https://github.com/firebase/firebase-cpp-sdk
-set(FIREBASE_CPP_SDK_PRESET_VERSION
-  "v8.6.0"
+set(FIREBASE_CPP_SDK_PRESET_VERSION "v8.8.0"
    CACHE STRING
   "Version tag of Firebase CPP SDK to download (if no local or not passed in) and use (no trailing .0)"
 )