Disable MSVC check for GDExtension builds

WeaselGames · Nov 30, 2023 · 05e90d3 · 05e90d3
1 parent 8de338b
commit 05e90d3
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 10 deletions.
diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
@@ -88,6 +88,11 @@ jobs:
         with:
           distribution: temurin
           java-version: 11
+
+      - uses: nttld/setup-ndk@v1
+        id: setup-ndk
+        with:
+          ndk-version: r25c
 
       - name: Load .scons_cache directory
         uses: actions/cache@v2
@@ -116,6 +121,7 @@ jobs:
         working-directory: ./scripts
         env:
           SCONS_CACHE: ${{github.workspace}}/.scons_cache/
+          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
         run: |
           scons platform=android ${{ matrix.opts.build-options }} ${{ env.SCONSFLAGS }}
       

diff --git a/.github/workflows/android-package.yml b/.github/workflows/android-package.yml
@@ -42,6 +42,11 @@ jobs:
           distribution: temurin
           java-version: 11
 
+      - uses: nttld/setup-ndk@v1
+        if: matrix.opts.platform == 'android'
+        with:
+          ndk-version: r25c
+
       - name: Set up Python 3.x
         uses: actions/setup-python@v2
         with:

diff --git a/.github/workflows/gdextension.yml b/.github/workflows/gdextension.yml
@@ -179,6 +179,12 @@ jobs:
         with:
           distribution: temurin
           java-version: 11
+
+      - uses: nttld/setup-ndk@v1
+        if: matrix.opts.platform == 'android'
+        id: setup-ndk
+        with:
+          ndk-version: r25c
 
       - name: (Windows) Install mingw64
         if: ${{ startsWith(matrix.opts.identifier, 'windows-') }}
@@ -196,7 +202,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install yasm
           cd /opt
-          curl -LO https://downloads.tuxfamily.org/godotengine/toolchains/linux/2021-02-11/x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2
+          curl -LO https://downloads.tuxfamily.org/godotengine/toolchains/linux/2023-11-01/x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2
           tar xf x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2
           rm -f x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2
           mv x86_64-godot-linux-gnu_sdk-buildroot buildroot
@@ -210,7 +216,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install yasm
           cd /opt
-          curl -LO https://downloads.tuxfamily.org/godotengine/toolchains/linux/2021-02-11/i686-godot-linux-gnu_sdk-buildroot.tar.bz2
+          curl -LO https://downloads.tuxfamily.org/godotengine/toolchains/linux/2023-11-01/i686-godot-linux-gnu_sdk-buildroot.tar.bz2
           tar xf i686-godot-linux-gnu_sdk-buildroot.tar.bz2
           rm -f i686-godot-linux-gnu_sdk-buildroot.tar.bz2
           mv i686-godot-linux-gnu_sdk-buildroot buildroot
@@ -236,11 +242,23 @@ jobs:
             ${{github.job}}-${{env.BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
             ${{github.job}}-${{env.BASE_BRANCH}}-${{github.ref}}
             ${{github.job}}-${{env.BASE_BRANCH}}-${{env.BASE_BRANCH}}
-      - name: Compile extension
+
+      - name: Compile extension (Android)
+        if: "startsWith(matrix.opts.identifier, 'android-')"
+        shell: sh
+        env:
+          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
+        run: |
+          scons target='${{ matrix.opts.target }}' platform='${{ matrix.opts.platform }}' arch='${{ matrix.opts.arch }}' ${{ matrix.opts.args }}
+          ls -l project/addons/luaAPI/bin/
+
+      - name: Compile extension (Other)
+        if: "!startsWith(matrix.opts.identifier, 'android-')"
         shell: sh
         run: |
           PATH=/opt/buildroot/bin:$PATH scons target='${{ matrix.opts.target }}' platform='${{ matrix.opts.platform }}' arch='${{ matrix.opts.arch }}' ${{ matrix.opts.args }}
           ls -l project/addons/luaAPI/bin/
+
       - name: Strip bins
         if: "!startsWith(matrix.opts.identifier, 'windows-') && startsWith(matrix.opts.arch, 'x86_')"
         shell: sh
@@ -375,7 +393,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install yasm
           cd /opt
-          curl -LO https://downloads.tuxfamily.org/godotengine/toolchains/linux/2021-02-11/x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2
+          curl -LO https://downloads.tuxfamily.org/godotengine/toolchains/linux/2023-11-01/x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2
           tar xf x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2
           rm -f x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2
           mv x86_64-godot-linux-gnu_sdk-buildroot buildroot
@@ -389,7 +407,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install yasm
           cd /opt
-          curl -LO https://downloads.tuxfamily.org/godotengine/toolchains/linux/2021-02-11/i686-godot-linux-gnu_sdk-buildroot.tar.bz2
+          curl -LO https://downloads.tuxfamily.org/godotengine/toolchains/linux/2023-11-01/i686-godot-linux-gnu_sdk-buildroot.tar.bz2
           tar xf i686-godot-linux-gnu_sdk-buildroot.tar.bz2
           rm -f i686-godot-linux-gnu_sdk-buildroot.tar.bz2
           mv i686-godot-linux-gnu_sdk-buildroot buildroot

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -108,7 +108,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install yasm
           cd /opt
-          curl -LO https://downloads.tuxfamily.org/godotengine/toolchains/linux/2021-02-11/x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2
+          curl -LO https://downloads.tuxfamily.org/godotengine/toolchains/linux/2023-11-01/x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2
           tar xf x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2
           rm -f x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2
           mv x86_64-godot-linux-gnu_sdk-buildroot buildroot
@@ -122,7 +122,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install yasm
           cd /opt
-          curl -LO https://downloads.tuxfamily.org/godotengine/toolchains/linux/2021-02-11/i686-godot-linux-gnu_sdk-buildroot.tar.bz2
+          curl -LO https://downloads.tuxfamily.org/godotengine/toolchains/linux/2023-11-01/i686-godot-linux-gnu_sdk-buildroot.tar.bz2
           tar xf i686-godot-linux-gnu_sdk-buildroot.tar.bz2
           rm -f i686-godot-linux-gnu_sdk-buildroot.tar.bz2
           mv i686-godot-linux-gnu_sdk-buildroot buildroot

diff --git a/external/SConscript b/external/SConscript
@@ -11,7 +11,7 @@ luaver = env["luaapi_luaver"]
 
 if luaver == "jit":
     if env["luaapi_luajit_build"]:
-        build_luajit(env)
+        build_luajit(env, True)
 
     env.Append(LIBPATH=[Dir("luaJIT/src").abspath])
     env.Append(LIBS=['libluajit'])

diff --git a/external/build_luajit.py b/external/build_luajit.py
@@ -14,8 +14,8 @@ def run(cmd):
         print("Error: return code: " + str(code))
         sys.exit(code)
 
-def build_luajit(env):
-    if not env.msvc:
+def build_luajit(env, extension=False):
+    if extension or not env.msvc:
         os.chdir("luaJIT")
 
         # cross compile posix->windows