mirror of
https://github.com/glfw/glfw.git
synced 2024-11-22 13:04:35 +00:00
Move Wayland build CI to focal
This finally allows us to drop the Wayland workarounds for CI. Thanks Travis CI!
This commit is contained in:
parent
b9dfce0070
commit
b3a79103a6
16
.travis.yml
16
.travis.yml
@ -36,14 +36,13 @@ matrix:
|
||||
- BUILD_SHARED_LIBS=OFF
|
||||
- CFLAGS=-Werror
|
||||
- os: linux
|
||||
dist: xenial
|
||||
dist: focal
|
||||
name: "Wayland shared library"
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ppa:kubuntu-ppa/backports
|
||||
packages:
|
||||
- extra-cmake-modules
|
||||
- wayland-protocols
|
||||
- libwayland-dev
|
||||
- libxkbcommon-dev
|
||||
- libegl1-mesa-dev
|
||||
@ -52,14 +51,13 @@ matrix:
|
||||
- BUILD_SHARED_LIBS=ON
|
||||
- CFLAGS=-Werror
|
||||
- os: linux
|
||||
dist: xenial
|
||||
dist: focal
|
||||
name: "Wayland static library"
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ppa:kubuntu-ppa/backports
|
||||
packages:
|
||||
- extra-cmake-modules
|
||||
- wayland-protocols
|
||||
- libwayland-dev
|
||||
- libxkbcommon-dev
|
||||
- libegl1-mesa-dev
|
||||
@ -108,12 +106,6 @@ script:
|
||||
fi
|
||||
- mkdir build
|
||||
- cd build
|
||||
- if test -n "${USE_WAYLAND}"; then
|
||||
git clone git://anongit.freedesktop.org/wayland/wayland-protocols;
|
||||
pushd wayland-protocols;
|
||||
git checkout 1.15 && ./autogen.sh --prefix=/usr && make && sudo make install;
|
||||
popd;
|
||||
fi
|
||||
- cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DGLFW_USE_WAYLAND=${USE_WAYLAND} -DGLFW_USE_OSMESA=${USE_OSMESA} ..
|
||||
- cmake --build .
|
||||
notifications:
|
||||
|
Loading…
Reference in New Issue
Block a user