Try enable web and android 32bit builds (#52)

V-Sekai · Feb 28, 2024 · f9a56aa · f9a56aa
1 parent 54a24cd
commit f9a56aa
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 36 deletions.
diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
@@ -11,21 +11,21 @@ jobs:
         include:
           - precision: single
             arch: arm64
-          #- precision: single
-          #  arch: arm32
+          - precision: single
+            arch: arm32
           - precision: single
             arch: x86_64
-          #- precision: single
-          #  arch: x86_32
+          - precision: single
+            arch: x86_32
 
           - precision: double
             arch: arm64
-          #- precision: double
-          #  arch: arm32
+          - precision: double
+            arch: arm32
           - precision: double
             arch: x86_64
-          #- precision: double
-          #  arch: x86_32
+          - precision: double
+            arch: x86_32
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout

diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml
@@ -3,11 +3,6 @@ on:
   workflow_dispatch:
   workflow_call:
 
-env:
-  OpenCL_ROOT: "${{ github.workspace }}/OpenCL-SDK"
-  OpenCL_INCLUDE_DIR: "${{ github.workspace }}/OpenCL-SDK/build/install/include"
-  OpenCL_LIBRARY: "${{ github.workspace }}/OpenCL-SDK/install/lib/OpenCL.lib"
-
 jobs:
   build:
     strategy:
@@ -26,28 +21,6 @@ jobs:
           submodules: true
           fetch-depth: 0
 
-      - uses: actions/checkout@v3
-        with:
-          path: ${{ github.workspace }}/OpenCL-SDK
-          repository: KhronosGroup/OpenCL-SDK
-          submodules: true
-          fetch-depth: 0
-
-      - name: Check OpenCL Cache
-        id: opencl_cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            OpenCL-SDK
-          key: __${{ runner.os }}_${{ matrix.arch }}-opencl-v2021.06.30__${{ hashFiles('**/CMakeLists.txt') }}
-          restore-keys: |
-            __${{runner.os }}-opencl__
-
-      - name: Build OpenCL
-        run: |
-          cmake -S OpenCL-SDK -B ${{ github.workspace }}/OpenCL-SDK/build -DOPENCL_ICD_LOADER_BUILD=ON -DOPENCL_SDK_BUILD_OPENGL_SAMPLES=OFF -A ${{matrix.opencl_arch}}
-          cmake --build ${{ github.workspace }}/OpenCL-SDK/build --target install
-
       - name: 🔗 GDExtension Build
         uses: ughuuu/godot-cpp-template/.github/actions/build@add-more-stuff/options-to-build
         with:

diff --git a/.github/workflows/runner.yml b/.github/workflows/runner.yml
@@ -31,4 +31,7 @@ jobs:
       APPLE_DEV_APP_ID: ${{ secrets.APPLE_DEV_APP_ID }}
   build_windows:
     needs: [lint]
-    uses: ./.github/workflows/build_windows.yml
+    uses: ./.github/workflows/build_windows.yml
+  build_web:
+    needs: [lint]
+    uses: ./.github/workflows/build_web.yml
diff --git a/SConstruct b/SConstruct
@@ -28,6 +28,10 @@ sources.extend([
     Glob("thirdparty/whisper.cpp/whisper.cpp"),
 ])
 
+# Disable 32 bit narrowing error.
+if env["platform"] != "windows":
+    env.Append(CCFLAGS=["-Wno-c++11-narrowing"])
+
 if env["platform"] == "macos" or env["platform"] == "ios":
     env.Append(LINKFLAGS=["-framework"])
     env.Append(LINKFLAGS=["Foundation"])