[CI] Enable ANGLE static linking.

godotengine · Oct 30, 2023 · f90efb1 · f90efb1
1 parent 9144457
commit f90efb1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml
@@ -6,7 +6,7 @@ on:
 env:
  # Used for the cache key. Add version suffix to force clean build.
  GODOT_BASE_BRANCH: master
- SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes
+ SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes "angle_libs=${{github.workspace}}/"
 
 concurrency:
  group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-macos
@@ -48,6 +48,17 @@ jobs:
  run: |
  sh misc/scripts/install_vulkan_sdk_macos.sh
 
+ - name: Download pre-built ANGLE static libraries
+ uses: dsaltares/fetch-gh-release-asset@1.1.1
+ with:
+ repo: godotengine/godot-angle-static
+ version: tags/chromium/6029
+ file: macOS.6029.Xcode_15.arm64.x86_64.zip
+ target: angle/angle.zip
+
+ - name: Extract pre-built ANGLE static libraries
+ run: unzip -o angle/angle.zip
+
  - name: Compilation
  uses: ./.github/actions/godot-build
  with:

diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
@@ -7,7 +7,7 @@ on:
 env:
  # Used for the cache key. Add version suffix to force clean build.
  GODOT_BASE_BRANCH: master
- SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes
+ SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes "angle_libs=${{github.workspace}}/"
  SCONS_CACHE_MSVC_CONFIG: true
 
 concurrency:
@@ -49,6 +49,17 @@ jobs:
  - name: Setup python and scons
  uses: ./.github/actions/godot-deps
 
+ - name: Download pre-built ANGLE static libraries
+ uses: dsaltares/fetch-gh-release-asset@1.1.1
+ with:
+ repo: godotengine/godot-angle-static
+ version: tags/chromium/6029
+ file: Windows.6029-1.MSVC_17.x86_64.x86_32.zip
+ target: angle/angle.zip
+
+ - name: Extract pre-built ANGLE static libraries
+ run: Expand-Archive -Force angle/angle.zip ${{github.workspace}}/
+
  - name: Setup MSVC problem matcher
  uses: ammaraskar/msvc-problem-matcher@master