Merge pull request #36 from limbonaut/gha-web-gdextension

GHA: Fix web gdextension build
limbonaut · Feb 15, 2024 · b024545 · b024545
2 parents 8a226a1 + b5247dd
commit b024545
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 8 deletions.
diff --git a/.github/workflows/gdextension.yml b/.github/workflows/gdextension.yml
@@ -34,6 +34,8 @@ on:
 env:
   SCONS_CACHE_LIMIT: 4096
   SCONSFLAGS: dev_build=no debug_symbols=no
+  EM_VERSION: 3.1.45
+  EM_CACHE_FOLDER: "emsdk-cache"
 
 jobs:
   gdextension:
@@ -144,8 +146,27 @@ jobs:
           python-version: "3.x"
           architecture: "x64"
 
+      - name: Set up Emscripten cache
+        if: matrix.opts.platform == 'web'
+        uses: actions/cache@v3
+        with:
+          path: ${{env.EM_CACHE_FOLDER}}
+          key: ${{env.EM_VERSION}}-${{runner.os}}-libs
+
+      - name: Set up Emscripten
+        if: matrix.opts.platform == 'web'
+        uses: mymindstorm/setup-emsdk@v12
+        with:
+          version: ${{env.EM_VERSION}}
+          actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
+
+      - name: Verify Emscripten setup
+        if: matrix.opts.platform == 'web'
+        run: |
+          emcc -v
+
       - name: Set up scons
-        if: matrix.opts.platform == 'windows' || matrix.opts.platform == 'macos'
+        if: matrix.opts.platform == 'windows' || matrix.opts.platform == 'macos' || matrix.opts.platform == 'web'
         run: |
           python -c "import sys; print(sys.version)"
           python -m pip install scons==4.4.0
@@ -195,7 +216,7 @@ jobs:
           ls -R out/
 
       - name: Strip lib
-        if: matrix.opts.platform != 'windows'
+        if: matrix.opts.platform != 'windows' && matrix.opts.platform != 'web'
         run: |
           ls -l -R out/addons/limboai/bin/
           echo "---"

diff --git a/.github/workflows/test_builds.yml b/.github/workflows/test_builds.yml
@@ -3,19 +3,19 @@ on:
   workflow_dispatch:
 
   push:
-    branches: [ master ]
+    branches: [master]
     paths-ignore:
       - "README.md"
-      - "LICENSE"
+      - "LICENSE.md"
       - "**/*.png"
       - "demo/**"
       - "doc/**"
 
   pull_request:
-    branches: [ master ]
+    branches: [master]
     paths-ignore:
       - "README.md"
-      - "LICENSE"
+      - "LICENSE.md"
       - "**/*.png"
       - "demo/**"
       - "doc/**"
@@ -77,8 +77,8 @@ jobs:
       - name: Set up Python 3.x
         uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
-          architecture: 'x64'
+          python-version: "3.x"
+          architecture: "x64"
 
       - name: Set up scons
         run: |