Update release.yml

upscayl · Jan 30, 2024 · 6b4381f · 6b4381f
1 parent 581fd7a
commit 6b4381f
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,7 +6,7 @@ env:
   DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
   APPLICATION_NAME: upscayl-bin
   VK_VERSION: 1.3.275.0
-  MOLTEN_VK_INCLUDE_PATH: "macOS/include/MoltenVK"
+  MOLTEN_VK_INCLUDE_PATH: "macOS/include/"
   MOLTEN_VK_LIB_PATH: "macOS/lib/MoltenVK.xcframework/macos-arm64_x86_64/libMoltenVK.a"
 
 jobs:
@@ -100,12 +100,12 @@ jobs:
         run: |
           wget https://sdk.lunarg.com/sdk/download/$VK_VERSION/mac/vulkansdk-macos-$VK_VERSION.dmg?Human=true -O vulkansdk-macos-$VK_VERSION.dmg
           hdiutil attach vulkansdk-macos-$VK_VERSION.dmg
-          sudo /Volumes/vulkansdk-macos-$VK_VERSION/InstallVulkan.app/Contents/MacOS/InstallVulkan --root `pwd`/vulkansdk-macos-$VK_VERSION --accept-licenses --default-answer --confirm-command install
-          find vulkansdk-macos-$VK_VERSION -type f | grep -v -E 'vulkan|glslang|MoltenVK' | xargs rm
+          sudo /Volumes/vulkansdk-macos-$VK_VERSION/InstallVulkan.app/Contents/MacOS/InstallVulkan --root `pwd`/vulkan-sdk --accept-licenses --default-answer --confirm-command install
+          find vulkan-sdk -type f | grep -v -E 'vulkan|glslang|MoltenVK' | xargs rm
           hdiutil detach /Volumes/vulkansdk-macos-$VK_VERSION
       - name: build-x86_64
         run: |
-          export VULKAN_SDK=`pwd`/vulkansdk-macos-$VK_VERSION/macOS/include/vulkan
+          export VULKAN_SDK=`pwd`/vulkan-sdk/macOS/
           mkdir build-x86_64 && cd build-x86_64
           cmake -D USE_STATIC_MOLTENVK=ON -D CMAKE_OSX_ARCHITECTURES="x86_64" \
               -D OpenMP_C_FLAGS="-Xclang -fopenmp" -D OpenMP_CXX_FLAGS="-Xclang -fopenmp" \
@@ -123,7 +123,7 @@ jobs:
           sudo cp /usr/local/Cellar/libomp/$(brew list --versions libomp | grep -oE '[0-9]+\.[0-9]+\.[0-9]')/lib/libomp.a $DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib
       - name: build-arm64
         run: |
-          export VULKAN_SDK=`pwd`/vulkansdk-macos-$VK_VERSION/macOS/include/vulkan
+          export VULKAN_SDK=`pwd`/vulkan-sdk/macOS/
           mkdir build-arm64 && cd build-arm64
           cmake -D USE_STATIC_MOLTENVK=ON -D CMAKE_OSX_ARCHITECTURES="arm64" \
               -D CMAKE_CROSSCOMPILING=ON -D CMAKE_SYSTEM_PROCESSOR=arm64 \