Fix CI

utopia-rise · Jan 13, 2025 · ec9bb20 · ec9bb20
1 parent baba396
commit ec9bb20
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 0 deletions.
diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
@@ -39,6 +39,17 @@ jobs:
         with:
           path: modules/kotlin_jvm
 
+      - name: Cherry-Pick Commit
+        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
+          }
+
       - uses: actions/setup-java@v4
         with:
           distribution: adopt-hotspot

diff --git a/.github/workflows/build_ios.yml b/.github/workflows/build_ios.yml
@@ -26,6 +26,17 @@ jobs:
         with:
           path: modules/kotlin_jvm
 
+      - name: Cherry-Pick Commit
+        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
+          }
+
       - name: Setup Godot build cache
         uses: ./modules/kotlin_jvm/.github/actions/scons-cache
         continue-on-error: true

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
@@ -63,6 +63,17 @@ jobs:
         with:
           path: modules/kotlin_jvm
 
+      - name: Cherry-Pick Commit
+        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
+          }
+
       - name: Setup Godot build cache
         uses: ./modules/kotlin_jvm/.github/actions/scons-cache
         with:

diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
@@ -79,6 +79,17 @@ jobs:
         with:
           path: modules/kotlin_jvm
 
+      - name: Cherry-Pick Commit
+        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
+          }
+
       - name: Setup Godot build cache
         uses: ./modules/kotlin_jvm/.github/actions/scons-cache
         with:

diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
@@ -63,6 +63,17 @@ jobs:
         with:
           path: modules/kotlin_jvm
 
+      - name: Cherry-Pick Commit
+        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
+          }
+
       - name: Setup Godot build cache
         uses: ./modules/kotlin_jvm/.github/actions/scons-cache
         with: