Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cube: Support runtime selection of WSI platform #1029

Merged
merged 3 commits into from
Oct 15, 2024
Merged

cube: Support runtime selection of WSI platform #1029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fdc43c0
cube: Support runtime selection of WSI platform
charles-lunarg Sep 5, 2024
91d5997
ci: Bump ubuntu versions used
charles-lunarg Oct 15, 2024
9cb3214
ci: Bump python version to 3.10
charles-lunarg Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 10 additions & 20 deletions .github/workflows/tools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,52 +37,42 @@ jobs:
cc: [ gcc ]
cxx: [ g++ ]
config: [ Debug, Release ]
os: [ ubuntu-20.04, ubuntu-22.04 ]
cube_wsi: [ XCB ]
os: [ ubuntu-22.04, ubuntu-22.04 ]
include:
# Test WAYLAND
- cc: gcc
cxx: g++
config: Release
os: ubuntu-22.04
cube_wsi: WAYLAND
# Test clang on ubuntu 20 with XLIB
# Test clang on ubuntu 22
- cc: clang
cxx: clang++
config: Debug
os: ubuntu-20.04
cube_wsi: XLIB
# Test clang on ubuntu 22 with the DISPLAY option
os: ubuntu-22.04
# Test clang on ubuntu 24
- cc: clang
cxx: clang++
config: Release
os: ubuntu-22.04
cube_wsi: DISPLAY
os: ubuntu-24.04


steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.7'
python-version: '3.10'
- run: |
sudo apt-get -qq update
sudo apt install libwayland-dev xorg-dev wayland-protocols
sudo apt install --yes libwayland-dev xorg-dev wayland-protocols
- uses: lukka/get-cmake@latest
with:
cmakeVersion: 3.17.2
- name: Setup ccache
uses: hendrikmuhs/ccache-action@v1.2
with:
key: ${{ runner.os }}-${{ matrix.config }}-${{ matrix.cc }}-${{matrix.cube_wsi}}
key: ${{ runner.os }}-${{ matrix.config }}-${{ matrix.cc }}
# This is to combat a bug when using 6.6 linux kernels with thread/address sanitizer
# https://github.com/google/sanitizers/issues/1716
- run: sudo sysctl vm.mmap_rnd_bits=28
- name: Configure
run: |
cmake -S. -B build -G "Ninja" \
-D CMAKE_BUILD_TYPE=${{matrix.config}} \
-D CUBE_WSI_SELECTION=${{matrix.cube_wsi}} \
-D UPDATE_DEPS=ON \
-D BUILD_WERROR=ON \
-D INSTALL_ICD=ON \
Expand Down Expand Up @@ -124,7 +114,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.7'
python-version: '3.10'
- uses: lukka/get-cmake@latest
- uses: ilammy/msvc-dev-cmd@v1
with:
Expand Down Expand Up @@ -234,7 +224,7 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: '3.10'
- run: sudo apt-get -qq update && sudo apt install libwayland-dev xorg-dev wayland-protocols
- run: sudo apt-get -qq update && sudo apt install --yes libwayland-dev xorg-dev wayland-protocols
- run: cmake -S . -B build/ -D UPDATE_DEPS=ON -D UPDATE_DEPS_DIR=external -D TOOLS_CODEGEN=ON
- run: cmake --build build --target tools_codegen
- run: git diff --exit-code
Expand Down
Loading
Loading