Skip to content

Fix macos archive templates #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 4, 2025
Merged

Fix macos archive templates #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4012447
Update ci.yml
humbletim Aug 4, 2025
33a139d
Update ci.yml
humbletim Aug 4, 2025
0ef43db
Update vulkan_prebuilt_helpers.sh
humbletim Aug 4, 2025
1fd3eec
Update ci.yml
humbletim Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
versions:
description: 'Vulkan SDK Versions'
required: true
default: '[ "1.4.309.0" ]'
default: '[ "1.4.321.0" ]'
oses:
description: 'Matrix OSes'
required: true
Expand Down Expand Up @@ -119,11 +119,12 @@ jobs:
with:
limit-access-to-actor: true
- uses: ./
id: composite
with:
version: ${{ fromJSON(github.event.inputs.versions)[0] }}
cache: false
- name: Setup tmate session
if: ${{ contains(github.event.inputs.extra_tests, 'tmate-after') }}
if: steps.composite.outcome != 'success' || ${{ contains(github.event.inputs.extra_tests, 'tmate-after') }}
uses: mxschmitt/action-tmate@v3.9
with:
limit-access-to-actor: true
Expand All @@ -147,3 +148,8 @@ jobs:
cmake -B tests/build -S tests -DCMAKE_BUILD_TYPE=Release -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=.
cmake --build tests/build --config release
./tests/build/test_vulkan
- name: Setup tmate session on failure
if: failure()
uses: mxschmitt/action-tmate@v3.9
with:
limit-access-to-actor: true
6 changes: 5 additions & 1 deletion vulkan_prebuilt_helpers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,15 @@ function install_mac() {
local InstallVulkan
if [[ -d InstallVulkan-${VULKAN_SDK_VERSION}.app/Contents ]] ; then
InstallVulkan=InstallVulkan-${VULKAN_SDK_VERSION}
elif [[ -d vulkansdk-macOS-${VULKAN_SDK_VERSION}.app/Contents ]] ; then
InstallVulkan=vulkansdk-macOS-${VULKAN_SDK_VERSION}
elif [[ -d InstallVulkan.app/Contents ]] ; then
InstallVulkan=InstallVulkan
else
echo "unrecognized zip/layout: vulkan_sdk.zip" >&2
echo "expecting ..vulkan.app/Contents folder (perhaps lunarg changed the archive layout again?): vulkan_sdk.zip" >&2
echo "file vulkan_sdk.zip" >&2
file vulkan_sdk.zip
echo "unzip -t vulkan_sdk.zip" >&2
unzip -t vulkan_sdk.zip
exit 7
fi
Expand Down
Loading