From 401244760bedec9ccb63fae4233caf1bab72a72e Mon Sep 17 00:00:00 2001 From: humbletim Date: Mon, 4 Aug 2025 19:05:26 -0400 Subject: [PATCH 1/4] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7aee9d9..bf86aea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -123,7 +123,7 @@ jobs: version: ${{ fromJSON(github.event.inputs.versions)[0] }} cache: false - name: Setup tmate session - if: ${{ contains(github.event.inputs.extra_tests, 'tmate-after') }} + if: failure() || ${{ contains(github.event.inputs.extra_tests, 'tmate-after') }} uses: mxschmitt/action-tmate@v3.9 with: limit-access-to-actor: true From 33a139df5232e7dd64113cc8d0a218cda353d9b9 Mon Sep 17 00:00:00 2001 From: humbletim Date: Mon, 4 Aug 2025 19:10:10 -0400 Subject: [PATCH 2/4] Update ci.yml --- .github/workflows/ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf86aea..64fec4d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -119,11 +119,12 @@ jobs: with: limit-access-to-actor: true - uses: ./ + id: composit with: version: ${{ fromJSON(github.event.inputs.versions)[0] }} cache: false - name: Setup tmate session - if: failure() || ${{ contains(github.event.inputs.extra_tests, 'tmate-after') }} + if: steps.composite.outcome != 'success' || failure() || ${{ contains(github.event.inputs.extra_tests, 'tmate-after') }} uses: mxschmitt/action-tmate@v3.9 with: limit-access-to-actor: true @@ -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 From 0ef43dbc8af56d77bcb1e8b1ebbbaa8718ead524 Mon Sep 17 00:00:00 2001 From: humbletim Date: Mon, 4 Aug 2025 19:19:42 -0400 Subject: [PATCH 3/4] Update vulkan_prebuilt_helpers.sh --- vulkan_prebuilt_helpers.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vulkan_prebuilt_helpers.sh b/vulkan_prebuilt_helpers.sh index 3d6ef66..bab54a2 100644 --- a/vulkan_prebuilt_helpers.sh +++ b/vulkan_prebuilt_helpers.sh @@ -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 From 1fd3eec34a6f4e72fbcc123b66c1d801b2417d87 Mon Sep 17 00:00:00 2001 From: humbletim Date: Mon, 4 Aug 2025 19:23:16 -0400 Subject: [PATCH 4/4] Update ci.yml --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64fec4d..8c7293d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -119,12 +119,12 @@ jobs: with: limit-access-to-actor: true - uses: ./ - id: composit + id: composite with: version: ${{ fromJSON(github.event.inputs.versions)[0] }} cache: false - name: Setup tmate session - if: steps.composite.outcome != 'success' || failure() || ${{ 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