aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Ramos <juan@lunarg.com>2023-11-10 17:12:24 -0700
committerJuan Ramos <114601453+juan-lunarg@users.noreply.github.com>2023-11-10 17:23:53 -0700
commitaf4fb97d7bde80997b0f61d53bb50bd6c56b8f50 (patch)
treecdd0d7b847adc9f330b478aba61e77b146400311
parent8ccd414a46544d5c512739198a7829fbf17e432e (diff)
downloadvulkan-headers-af4fb97d7bde80997b0f61d53bb50bd6c56b8f50.tar.gz
ci cleanup
-rw-r--r--.github/workflows/ci.yml67
1 files changed, 24 insertions, 43 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fa96731..f8ab544 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,69 +17,50 @@ permissions:
contents: read
jobs:
- ubuntu-cmake-install:
- runs-on: ubuntu-latest
+ build-tests:
+ name: BUILD_TESTS=ON ${{ matrix.os }}
+ runs-on: ${{ matrix.os }}
+ strategy:
+ matrix:
+ os: [ ubuntu-latest, windows-latest, macos-latest ]
steps:
- uses: actions/checkout@v4
- uses: lukka/get-cmake@latest
- with:
- cmakeVersion: 3.17.0
- - name: Configure Vulkan-Headers
- run: cmake -S . -B build
- - name: Install Vulkan-Headers
- run: cmake --install build --prefix ${{ github.workspace }}/build/install
- - name: Test Vulkan-Headers find_package support
- run: cmake -S tests/find_package -B build/tests/find_package -D CMAKE_PREFIX_PATH=${{ github.workspace }}/build/install
+ - uses: ilammy/msvc-dev-cmd@v1
+ - run: cmake -S . -B build -D BUILD_TESTS=ON --log-level=DEBUG
+ - run: cmake --build build
- ubuntu-cmake-tests:
+ test-cmake-minimum:
+ name: Test CMake minimum
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: lukka/get-cmake@latest
with:
- cmakeVersion: 3.25.0
- - name: Configure Vulkan-Headers
- run: cmake -S . -B build -D BUILD_TESTS=ON --log-level=DEBUG
- - name: Build Vulkan-Headers Tests
- run: cmake --build build
-
- windows-cmake-tests:
- runs-on: windows-latest
- strategy:
- matrix:
- arch: [ amd64, amd64_x86 ]
- steps:
- - uses: actions/checkout@v4
- - uses: lukka/get-cmake@latest
- - uses: ilammy/msvc-dev-cmd@v1
- with:
- arch: ${{ matrix.arch }}
- - name: Configure Vulkan-Headers
- run: cmake -S . -B build -D BUILD_TESTS=ON --log-level=DEBUG
- - name: Build Vulkan-Headers Tests
- run: cmake --build build
+ cmakeVersion: 3.15.0
+ - run: cmake -S . -B build/ --loglevel=DEBUG
+ - run: cmake --install build/ --prefix build/install
- test-cmake-minimum:
+ find_package:
+ name: Test find_package
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: lukka/get-cmake@latest
with:
- cmakeVersion: 3.15.0
- - name: Configure Vulkan-Headers
- run: cmake -S . -B build/ --loglevel=DEBUG
- - name: Install Vulkan-Headers
- run: cmake --install build/ --prefix build/install
+ cmakeVersion: 3.17.0
+ - run: cmake -S . -B build
+ - run: cmake --install build --prefix ${{ github.workspace }}/build/install
+ - run: cmake -S tests/find_package -B build/tests/find_package -D CMAKE_PREFIX_PATH=${{ github.workspace }}/build/install
- ubuntu-cmake-add_subdirectory:
+ add_subdirectory:
+ name: Test add_subdirectory
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: lukka/get-cmake@latest
- - name: Test add_subdirectory support
- run: cmake -S tests/add_subdirectory -B tests/add_subdirectory/build
- - name: Build
- run: cmake --build tests/add_subdirectory/build
+ - run: cmake -S tests/add_subdirectory -B tests/add_subdirectory/build
+ - run: cmake --build tests/add_subdirectory/build
reuse:
runs-on: ubuntu-latest