Skip to content

Commit c25f411

Browse files
committed
update test; update to gha-setup-vsdevenv@v5
1 parent 06a2967 commit c25f411

File tree

3 files changed

+21
-20
lines changed

3 files changed

+21
-20
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
extra_tests:
99
description: 'Enable additional CI tests'
1010
required: false
11-
default: false
11+
default: 'false'
1212
components:
1313
description: Vulkan SDK Components
1414
required: false
@@ -21,7 +21,7 @@ on:
2121
oses:
2222
description: 'Matrix OSes'
2323
required: true
24-
default: '[ "ubuntu-latest", "windows-latest", "windows-2022", "macos-13", "macos-14" ]'
24+
default: '[ "ubuntu-latest", "windows-latest", "windows-2022", "macos-13", "macos-latest" ]'
2525
jobs:
2626
setup-all-matrix:
2727
if: ${{ github.event.inputs.extra_tests == 'true' || github.event.inputs.extra_tests == 'matrix' }}
@@ -40,20 +40,21 @@ jobs:
4040
- name: Print runner configurations
4141
run: |
4242
echo runner os: ${{ runner.os }}, arch: ${{ runner.arch }}
43-
- name: checkout seanmiddleditch/gha-setup-vsdevenv@v4
44-
if: runner.os == 'Windows'
45-
uses: actions/checkout@v4
46-
with:
47-
repository: seanmiddleditch/gha-setup-vsdevenv
48-
ref: v4
49-
path: gha-setup-vsdevenv
50-
- name: execute seanmiddleditch/gha-setup-vsdevenv@v4
51-
if: runner.os == 'Windows'
52-
shell: cmd
53-
working-directory: gha-setup-vsdevenv
54-
run: |
55-
npm install @actions/core
56-
node dist/index.js | grep -v ::set-output
43+
- uses: seanmiddleditch/gha-setup-vsdevenv@v5
44+
# - name: checkout seanmiddleditch/gha-setup-vsdevenv@v4
45+
# if: runner.os == 'Windows'
46+
# uses: actions/checkout@v4
47+
# with:
48+
# repository: seanmiddleditch/gha-setup-vsdevenv
49+
# ref: v4
50+
# path: gha-setup-vsdevenv
51+
# - name: execute seanmiddleditch/gha-setup-vsdevenv@v4
52+
# if: runner.os == 'Windows'
53+
# shell: cmd
54+
# working-directory: gha-setup-vsdevenv
55+
# run: |
56+
# npm install @actions/core
57+
# node dist/index.js | grep -v ::set-output
5758
- name: Test Vulkan SDK Install
5859
shell: bash
5960
run: |

tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ endforeach()
1515

1616
message(STATUS "")
1717
message(STATUS "|| VULKAN_SDK TEST APPLICATION ||")
18-
find_package(Vulkan REQUIRED FATAL_ERROR)
18+
find_package(Vulkan REQUIRED)
1919
add_executable(test_vulkan test_vulkan.c)
2020
target_link_libraries(test_vulkan PRIVATE Vulkan::Vulkan)
2121

tests/test_vulkan.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
#include <stdint.h>
44

55
int main(int argc, char** argv) {
6-
fprintf(stderr, "main....\n");fflush(stderr);
6+
fprintf(stderr, "[test_vulkan.c] main....\n");fflush(stderr);
77
uint32_t version = 0;
88
PFN_vkEnumerateInstanceVersion vkEnumerateInstanceVersion = (PFN_vkEnumerateInstanceVersion)vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion");
99
if(vkEnumerateInstanceVersion) {
1010
vkEnumerateInstanceVersion(&version);
1111
} else {
12-
fprintf(stderr, "vkGetInstanceProcAddr (%p) lookup of vkEnumerateInstanceVersion failed...\n", vkEnumerateInstanceVersion);
12+
fprintf(stderr, "[test_vulkan.c] vkGetInstanceProcAddr (%p) lookup of vkEnumerateInstanceVersion failed...\n", vkEnumerateInstanceVersion);
1313
return 1;
1414
}
1515

16-
printf("Vulkan Version: (%u) %d.%d.%d\n", version,
16+
printf("[test_vulkan.c] Vulkan Version: (%u) %d.%d.%d\n", version,
1717
VK_VERSION_MAJOR(version),
1818
VK_VERSION_MINOR(version),
1919
VK_VERSION_PATCH(version)

0 commit comments

Comments
 (0)