Merge pull request #90 from SideQuestVR/fix/ci

Fix CI to correctly manage Samples folder
SideQuestVR · Jan 7, 2025 · db262e4 · db262e4
2 parents 1c72aba + e8147e3
commit db262e4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 11 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -19,24 +19,35 @@ jobs:
         TAG=$(jq -r '.version' package.json)
         echo "TAG=$TAG" >> $GITHUB_ENV
         if git rev-parse $TAG >/dev/null 2>&1; then
-            echo "TAG_EXISTS=true" >> $GITHUB_ENV
+            echo "::error::Tag already exists: $TAG"
         else
             echo "TAG_EXISTS=false" >> $GITHUB_ENV
         fi
 
-    - name: Samples to Samples~
+    - name: Publish on UPM branch
       run: |
         if [[ -d "Samples" ]]; then
           git mv Samples Samples~
           rm -f Samples.meta
-          git config --global user.name 'github-bot'
-          git config --global user.email '[email protected]'
-          git commit -am "fix: Samples => Samples~"
-          git push -u origin main
         fi
 
+        mkdir ../upm
+        cp -r . ../upm
+        rm -rf ../upm/.git # don't want to replace git history!
+
+        git reset --hard HEAD
+        git checkout upm
+
+        cp -r ../upm/* .
+        rm -rf ../upm
+
+        git config --global user.name 'github-bot'
+        git config --global user.email '[email protected]'
+        git commit -am "$TAG" --no-verify
+        git push -u origin upm
+
     - name: Create Release
       if: env.TAG_EXISTS == 'false'
       run: |
-        git tag ${{ env.TAG }} main
+        git tag ${{ env.TAG }} upm
         git push origin --tags
diff --git a/Runtime/Scripts/Scene/BanterScene.cs b/Runtime/Scripts/Scene/BanterScene.cs
@@ -870,7 +870,8 @@ public void SetJsObjectActive(string msg, int reqId)
                 Debug.LogError("[Banter] SetJsObjectActive message is malformed: " + msg);
                 return;
             }
-            try{
+            try
+            {
                 var banterObject = GetGameObject(int.Parse(msgParts[0]));
                 if (banterObject != null)
                 {
@@ -880,8 +881,10 @@ public void SetJsObjectActive(string msg, int reqId)
                         SendObjectUpdate(banterObject, reqId);
                     });
                 }
-            }catch(Exception ex){ 
-                Debug.LogError("SetJsObjectActive threw an exception: "  +msg);
+            }
+            catch (Exception ex)
+            {
+                Debug.LogError("SetJsObjectActive threw an exception: " + msg);
                 Debug.LogException(ex);
             }
         }
@@ -1055,7 +1058,8 @@ private List<object> SetComponentProperties(int startIndex, string[] parts, Bant
                             banterComp.UpdateProperty(name, valFloat);
                             break;
                         case PropertyType.Int:
-                            if(propParts[2].Equals("null")) {
+                            if (propParts[2].Equals("null"))
+                            {
                                 propParts[2] = "0";
                             }
                             var valInt = int.Parse(propParts[2]);