From: juan-lunarg <juan@lunarg.com>
Date: Thu, 4 May 2023 18:54:38 +0000 (-0600)
Subject: ci: Test Ninja build
X-Git-Tag: upstream/1.3.268~180
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a6f06c091b0a0783f950e87e10600b50b9fc8b30;p=platform%2Fupstream%2FVulkan-Loader.git

ci: Test Ninja build
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dafc5271..f2506d9d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -75,7 +75,7 @@ jobs:
               run: ctest --output-on-failure
 
             - name: Verify generated source files
-              run: python scripts/generate_source.py --verify external/Vulkan-Headers/registry
+              run: python scripts/generate_source.py --verify external/${{matrix.config}}/Vulkan-Headers/registry
 
             - name: Verify code formatting with clang-format
               run: ./scripts/check_code_format.sh
@@ -126,14 +126,12 @@ jobs:
               working-directory: ./build
               run: ctest --output-on-failure
 
-    windows:
-        runs-on: ${{matrix.os}}
-
+    windows_vs:
+        runs-on: windows-latest
         strategy:
             matrix:
                 arch: [ Win32, x64 ]
                 config: [ Debug, Release ]
-                os: [ windows-latest ]
 
         steps:
             - uses: actions/checkout@v3
@@ -142,17 +140,48 @@ jobs:
                 python-version: '3.7'
 
             - name: Generate build files
-              run: cmake -S. -Bbuild -A${{matrix.arch}} -DBUILD_TESTS=ON -DUPDATE_DEPS=ON
+              run: cmake -S. -B build -DBUILD_TESTS=ON -DUPDATE_DEPS=ON -D CMAKE_BUILD_TYPE=${{matrix.config}} -A ${{ matrix.arch }}
 
             - name: Build the loader
               run: cmake --build ./build --config ${{matrix.config}}
 
             - name: Run regression tests
               working-directory: ./build
-              run: ctest --output-on-failure
-
-            - name: Verify generated source files
-              run: python scripts/generate_source.py --verify external/Vulkan-Headers/registry
+              run: ctest --output-on-failure -C ${{matrix.config}}
+
+    # Something about Github Actions + Windows + Ninja + Unicode doesn't play nicely together.
+    # https://github.com/KhronosGroup/Vulkan-Loader/pull/1188#issuecomment-1536659318
+    #
+    # Disable testing explicitly for Ninja. But still ensure it builds properly.
+    windows_ninja:
+      runs-on: windows-2019
+      strategy:
+        matrix:
+            arch: [ Win32, x64 ]
+            config: [ Debug, Release ]
+            exclude:
+              - arch: Win32
+                config: release
+              - arch: x64
+                config: debug
+
+      steps:
+          - uses: actions/checkout@v3
+          - uses: actions/setup-python@v3
+            with:
+              python-version: '3.7'
+          - uses: ilammy/msvc-dev-cmd@v1
+            with:
+              arch: ${{ matrix.arch }}
+
+          - name: Configure
+            run: cmake -S. -B build -DUPDATE_DEPS=ON -D CMAKE_BUILD_TYPE=${{matrix.config}} -G "Ninja"
+
+          - name: Build
+            run: cmake --build ./build
+
+          - name: Verify generated source files
+            run: python scripts/generate_source.py --verify external/${{matrix.config}}/Vulkan-Headers/registry
 
     mac:
         runs-on: ${{matrix.os}}
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index 36445dc0..34785c51 100644
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -279,10 +279,6 @@ if(WIN32)
 
     target_link_libraries(vulkan PRIVATE loader_specific_options loader-opt)
 
-    if (UPDATE_DEPS)
-        add_dependencies(vulkan vl_update_deps)
-    endif()
-
     # when adding the suffix the import and runtime library names must be consistent
     # mingw: libvulkan-1.dll.a / vulkan-1.dll
     # msvc: vulkan-1.lib / vulkan-1.dll