diff options
| author | Charles Giessen <charles@lunarg.com> | 2023-06-20 11:32:24 -0600 |
|---|---|---|
| committer | Charles Giessen <46324611+charles-lunarg@users.noreply.github.com> | 2023-06-20 14:23:27 -0600 |
| commit | 07924a8a495dd8bcda112597da1bbc9b28f9bf63 (patch) | |
| tree | 014d3b77d02097991d67781d20be30356679cb28 | |
| parent | 96ecde1d4f867fbeab06e270723ad68b245c97c3 (diff) | |
| download | usermoji-07924a8a495dd8bcda112597da1bbc9b28f9bf63.tar.xz | |
ci: Reduce linux actions combinations
Reduces the matrix from 32 runs down to 6, making each possible configuration
appear only once rather than test all possible combinations of configurations.
| -rw-r--r-- | .github/workflows/tools.yml | 33 | ||||
| -rw-r--r-- | scripts/known_good.json | 3 |
2 files changed, 23 insertions, 13 deletions
diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml index ca0ec51c..33f262ff 100644 --- a/.github/workflows/tools.yml +++ b/.github/workflows/tools.yml @@ -34,18 +34,31 @@ jobs: strategy: matrix: - cc: [ gcc, clang ] - cxx: [ g++, clang++ ] + cc: [ gcc ] + cxx: [ g++ ] config: [ Debug, Release ] os: [ ubuntu-20.04, ubuntu-22.04 ] - cube_wsi: [ XCB, XLIB, WAYLAND, DISPLAY ] - exclude: - - cc: gcc - cxx: clang++ - - cc: clang - cxx: g++ - - os: ubuntu-20.04 - cube_wsi: WAYLAND + cube_wsi: [ XCB ] + include: + # Test WAYLAND + - cc: gcc + cxx: g++ + config: Release + os: ubuntu-22.04 + cube_wsi: WAYLAND + # Test clang on ubuntu 20 with XLIB + - cc: clang + cxx: clang++ + config: Debug + os: ubuntu-20.04 + cube_wsi: XLIB + # Test clang on ubuntu 22 with the DISPLAY option + - cc: clang + cxx: clang++ + config: Release + os: ubuntu-22.04 + cube_wsi: DISPLAY + steps: - uses: actions/checkout@v3 diff --git a/scripts/known_good.json b/scripts/known_good.json index e00a26aa..c1033e70 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -39,9 +39,6 @@ "repo_name": "Vulkan-Headers" } ], - "cmake_options": [ - "-DBUILD_TESTS=NO" - ], "build_platforms": [ "linux", "darwin" |