浏览代码

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

Rémi Verschelde 3 年之前
父节点
当前提交
572629d4ee
共有 3 个文件被更改,包括 8 次插入2 次删除
  1. 1 0
      .github/workflows/linux_builds.yml
  2. 6 1
      .github/workflows/macos_builds.yml
  3. 1 1
      misc/scripts/install_vulkan_sdk_macos.sh

+ 1 - 0
.github/workflows/linux_builds.yml

@@ -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

+ 6 - 1
.github/workflows/macos_builds.yml

@@ -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

+ 1 - 1
misc/scripts/install_vulkan_sdk_macos.sh

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