diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-07-29 12:52:40 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-07-29 14:32:57 +0200 |
| commit | da14b19bbf3abca28971dae0e2a3438d7d5dadad (patch) | |
| tree | 5a4cef0c4d44f3f5b22ba409d1397a7a383764c8 | |
| parent | cd24fb848e5727ebc7ccbcd0fc94112c6baed4f2 (diff) | |
CI: Link MoltenVK statically on macOS
Same as done for official builds.
Also make artifacts executable before zipping.
| -rw-r--r-- | .github/workflows/linux_builds.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/macos_builds.yml | 7 | ||||
| -rwxr-xr-x | misc/scripts/install_vulkan_sdk_macos.sh | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml index aa862168b1..341d70d0e7 100644 --- a/.github/workflows/linux_builds.yml +++ b/.github/workflows/linux_builds.yml @@ -246,6 +246,7 @@ jobs: if: ${{ matrix.artifact }} run: | strip bin/godot.* + chmod +x bin/godot.* - name: Upload artifact uses: ./.github/actions/upload-artifact diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml index 0cb037bfae..0ad0995bb7 100644 --- a/.github/workflows/macos_builds.yml +++ b/.github/workflows/macos_builds.yml @@ -5,7 +5,7 @@ on: [push, pull_request] env: # Only used for the cache key. Increment version to force clean build. GODOT_BASE_BRANCH: master-v3 - SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes use_volk=yes + SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes concurrency: group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-macos @@ -45,6 +45,10 @@ jobs: - name: Setup python and scons uses: ./.github/actions/godot-deps + - name: Setup Vulkan SDK + run: | + sh misc/scripts/install_vulkan_sdk_macos.sh + - name: Compilation uses: ./.github/actions/godot-build with: @@ -65,6 +69,7 @@ jobs: - name: Prepare artifact run: | strip bin/godot.* + chmod +x bin/godot.* - name: Upload artifact uses: ./.github/actions/upload-artifact diff --git a/misc/scripts/install_vulkan_sdk_macos.sh b/misc/scripts/install_vulkan_sdk_macos.sh index 817302d77f..d78659fa9f 100755 --- a/misc/scripts/install_vulkan_sdk_macos.sh +++ b/misc/scripts/install_vulkan_sdk_macos.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh set -euo pipefail IFS=$'\n\t' |