Merge pull request #148 from firebase/version_workflow

Fix the issue that no EDM4U is packaged

Author: cynthiajoan

.github/workflows/integration_tests.yml

@@ -185,16 +185,16 @@ jobs:
         uses: dawidd6/action-download-artifact@v2
         if: ${{ github.event.inputs.test_packaged_sdk != '' }}
         with:
-          name: 'firebase_unity_sdk'
+          name: 'firebase_unity_sdk.zip'
           workflow: 'packaging.yml'
           run_id: ${{ github.event.inputs.test_packaged_sdk }}
-          path: firebase_unity_sdk
+          
       - name: Build integration tests
         timeout-minutes: 220
         shell: bash
         run: |
           if [[ -n "${{ github.event.inputs.test_packaged_sdk }}" ]]; then
-            mv -v firebase_unity_sdk ~/Downloads/
+            unzip -q firebase_unity_sdk.zip -d ~/Downloads/
           else
             if [[ -z "${{ github.event.inputs.sdk_url }}" ]];then
               sdk_url="https://dl.google.com/firebase/sdk/unity/firebase_unity_sdk_8.5.0.zip"

.github/workflows/package.yml

@@ -101,7 +101,13 @@ jobs:
         run: |
           cd built_artifect
           find . -type f -name "*.zip" -exec mv {} . \;
-          ls -l
+          find . -empty -type d -delete
+          ls -lR
+          for zip_file in *.zip
+          do
+            unzip -l $zip_file
+          done
+          ls -lR
           cd ..
 
       - name: Package unitypackage
@@ -161,10 +167,11 @@ jobs:
 
       - name: Create Zip File
         run: |
-          cp docs/readme.md output/.
-          cp LICENSE output/.
-          ls -Rl output
-          zip -r firebase_unity_sdk.zip output
+          mv output firebase_unity_sdk
+          cp docs/readme.md firebase_unity_sdk/.
+          cp LICENSE firebase_unity_sdk/.
+          ls -Rl firebase_unity_sdk
+          zip -r firebase_unity_sdk.zip firebase_unity_sdk
 
       - name: compute SDK hash
         shell: bash

build_package.py

@@ -163,12 +163,13 @@ def main(argv):
     cmd_args.append("--enabled_sections=build_dotnet4")
     cmd_args.append("--output_unitypackage=False")
   else:
-    cmd_args.append("--enabled_sections=build_dotnet3 build_dotnet4")
+    cmd_args.append("--enabled_sections=build_dotnet3 build_dotnet4 asset_package_only")
 
   # Check if need to gen new guids
   p = subprocess.Popen(cmd_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
   output, error = p.communicate()
   if p.returncode != 0:
+    logging.info("Generate new Guids")
     error_str = str(error)
     error_str = error_str.split("assets:")[-1]
     error_str = error_str.rstrip("\\n\'")
@@ -187,12 +188,16 @@ def main(argv):
       print(file)
       gen_cmd_args.append(file)
     subprocess.call(gen_cmd_args)
-
-    # Need to package again if has that error
-    subprocess.call(cmd_args)   
   else:
-    error_list = str(error).split("\\n")
-    logging.info("\n".join(error_list))
+    #error_list = str(error).split("\\n")
+    logging.info("No need to generate new Guids")
+
+  # Package with new guids
+  logging.info("Start Package")
+  if os.path.exists(output_folder):
+    shutil.rmtree(output_folder)
+  subprocess.call(cmd_args)
+
   logging.info("Packaging done for version %s", last_version)
 
 if __name__ == '__main__':

unpack_package.py

@@ -95,7 +95,7 @@ def unpack_one_package(script, product_path):
   output_file = os.path.join(output_path, dotnet_name+"_"+product_name+".txt")
   if os.path.exists(output_file):
     os.remove(output_file)
-  subprocess.run(["tree",unpack_folder,"-o", output_file])
+  subprocess.run(["tree","-h",unpack_folder,"-o", output_file])
   logging.info("%s is unpacked", product_path)
 
 def main(argv):