Fix CI (#749)

* Fix CI
utopia-rise · Jan 14, 2025 · 9819350 · 9819350
1 parent d592c48
commit 9819350
Show file tree

Hide file tree

Showing 6 changed files with 9,093 additions and 0 deletions.
diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
@@ -39,6 +39,10 @@ jobs:
         with:
           path: modules/kotlin_jvm
 
+      - name: Apply git patch
+        run: |
+          git apply --ignore-whitespace  modules/kotlin_jvm/git.patch
+
       - 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,10 @@ jobs:
         with:
           path: modules/kotlin_jvm
 
+      - name: Apply git patch
+        run: |
+          git apply --ignore-whitespace  modules/kotlin_jvm/git.patch
+
       - 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,10 @@ jobs:
         with:
           path: modules/kotlin_jvm
 
+      - name: Apply git patch
+        run: |
+          git apply --ignore-whitespace  modules/kotlin_jvm/git.patch
+
       - 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,10 @@ jobs:
         with:
           path: modules/kotlin_jvm
 
+      - name: Apply git patch
+        run: |
+          git apply --ignore-whitespace  modules/kotlin_jvm/git.patch
+
       - 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,10 @@ jobs:
         with:
           path: modules/kotlin_jvm
 
+      - name: Apply git patch
+        run: |
+          git apply --ignore-whitespace  modules/kotlin_jvm/git.patch
+
       - name: Setup Godot build cache
         uses: ./modules/kotlin_jvm/.github/actions/scons-cache
         with: