Fix CI

utopia-rise · Jan 14, 2025 · 8a87459 · 8a87459
1 parent ec9bb20
commit 8a87459
Show file tree

Hide file tree

Showing 6 changed files with 9,062 additions and 45 deletions.
diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
@@ -39,16 +39,9 @@ jobs:
         with:
           path: modules/kotlin_jvm
 
-      - name: Cherry-Pick Commit
+      - name: Apply git patch
         run: |
-          # Specify the commit hash you want to cherry-pick
-            COMMIT_HASH="5318008ce6a52fa3af7f466189a263d4905c76fa"
-            git cherry-pick $COMMIT_HASH || {
-          # Handle merge conflicts
-            echo "Conflict detected during cherry-pick"
-            git cherry-pick --abort
-            exit 1
-          }
+          git apply git.patch 
 
       - uses: actions/setup-java@v4
         with:

diff --git a/.github/workflows/build_ios.yml b/.github/workflows/build_ios.yml
@@ -26,16 +26,9 @@ jobs:
         with:
           path: modules/kotlin_jvm
 
-      - name: Cherry-Pick Commit
+      - name: Apply git patch
         run: |
-          # Specify the commit hash you want to cherry-pick
-            COMMIT_HASH="5318008ce6a52fa3af7f466189a263d4905c76fa"
-            git cherry-pick $COMMIT_HASH || {
-          # Handle merge conflicts
-            echo "Conflict detected during cherry-pick"
-            git cherry-pick --abort
-            exit 1
-          }
+          git apply git.patch 
 
       - name: Setup Godot build cache
         uses: ./modules/kotlin_jvm/.github/actions/scons-cache

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
@@ -63,16 +63,9 @@ jobs:
         with:
           path: modules/kotlin_jvm
 
-      - name: Cherry-Pick Commit
+      - name: Apply git patch
         run: |
-          # Specify the commit hash you want to cherry-pick
-            COMMIT_HASH="5318008ce6a52fa3af7f466189a263d4905c76fa"
-            git cherry-pick $COMMIT_HASH || {
-          # Handle merge conflicts
-            echo "Conflict detected during cherry-pick"
-            git cherry-pick --abort
-            exit 1
-          }
+          git apply git.patch 
 
       - name: Setup Godot build cache
         uses: ./modules/kotlin_jvm/.github/actions/scons-cache

diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
@@ -79,16 +79,9 @@ jobs:
         with:
           path: modules/kotlin_jvm
 
-      - name: Cherry-Pick Commit
+      - name: Apply git patch
         run: |
-          # Specify the commit hash you want to cherry-pick
-            COMMIT_HASH="5318008ce6a52fa3af7f466189a263d4905c76fa"
-            git cherry-pick $COMMIT_HASH || {
-          # Handle merge conflicts
-            echo "Conflict detected during cherry-pick"
-            git cherry-pick --abort
-            exit 1
-          }
+          git apply git.patch 
 
       - name: Setup Godot build cache
         uses: ./modules/kotlin_jvm/.github/actions/scons-cache

diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
@@ -63,16 +63,9 @@ jobs:
         with:
           path: modules/kotlin_jvm
 
-      - name: Cherry-Pick Commit
+      - name: Apply git patch
         run: |
-          # Specify the commit hash you want to cherry-pick
-            COMMIT_HASH="5318008ce6a52fa3af7f466189a263d4905c76fa"
-            git cherry-pick $COMMIT_HASH || {
-          # Handle merge conflicts
-            echo "Conflict detected during cherry-pick"
-            git cherry-pick --abort
-            exit 1
-          }
+          git apply git.patch 
 
       - name: Setup Godot build cache
         uses: ./modules/kotlin_jvm/.github/actions/scons-cache