Merge pull request #63620 from akien-mga/ci-macos-link-mvk-statically

This commit is contained in:
Rémi Verschelde 2022-07-29 15:58:38 +02:00 committed by GitHub
commit 572629d4ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions

View file

@ -246,6 +246,7 @@ jobs:
if: ${{ matrix.artifact }} if: ${{ matrix.artifact }}
run: | run: |
strip bin/godot.* strip bin/godot.*
chmod +x bin/godot.*
- name: Upload artifact - name: Upload artifact
uses: ./.github/actions/upload-artifact uses: ./.github/actions/upload-artifact

View file

@ -5,7 +5,7 @@ on: [push, pull_request]
env: env:
# Only used for the cache key. Increment version to force clean build. # Only used for the cache key. Increment version to force clean build.
GODOT_BASE_BRANCH: master-v3 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: concurrency:
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-macos group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-macos
@ -45,6 +45,10 @@ jobs:
- name: Setup python and scons - name: Setup python and scons
uses: ./.github/actions/godot-deps uses: ./.github/actions/godot-deps
- name: Setup Vulkan SDK
run: |
sh misc/scripts/install_vulkan_sdk_macos.sh
- name: Compilation - name: Compilation
uses: ./.github/actions/godot-build uses: ./.github/actions/godot-build
with: with:
@ -65,6 +69,7 @@ jobs:
- name: Prepare artifact - name: Prepare artifact
run: | run: |
strip bin/godot.* strip bin/godot.*
chmod +x bin/godot.*
- name: Upload artifact - name: Upload artifact
uses: ./.github/actions/upload-artifact uses: ./.github/actions/upload-artifact

View file

@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env sh
set -euo pipefail set -euo pipefail
IFS=$'\n\t' IFS=$'\n\t'