Skip to content

Commit

Permalink
Switch to ubuntu/bionic build on Travis CI
Browse files Browse the repository at this point in the history
It's faster and more reliable than previous docker + alpine solution.
  • Loading branch information
francma committed Nov 14, 2019
1 parent fc95914 commit 6b9259b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
23 changes: 13 additions & 10 deletions .travis.yml
@@ -1,14 +1,17 @@
dist: xenial
os: linux
arch: arm64
dist: bionic
language: minimal

env:
DOCKER_IMAGE: francma/wob-travis-ci
DOCKER_CWD: /wob
BUILD_DIR: build

services:
- docker
addons:
apt:
packages:
- meson
- wayland-protocols
- ninja-build
- libwayland-dev

script:
- docker run -v "$PWD":"$DOCKER_CWD" -w "$DOCKER_CWD" "$DOCKER_IMAGE" /usr/bin/meson "$BUILD_DIR" --buildtype release
- docker run -v "$PWD":"$DOCKER_CWD" -w "$DOCKER_CWD" "$DOCKER_IMAGE" /usr/bin/ninja -C "$BUILD_DIR"
- meson build
- ninja -C build
- meson test -C build
2 changes: 1 addition & 1 deletion meson.build
Expand Up @@ -9,7 +9,7 @@ project(
cc = meson.get_compiler('c')

wlr_protocol_dir = meson.source_root() + '/wlr-protocols'
wayland_protos = dependency('wayland-protocols', version: '>=1.14')
wayland_protos = dependency('wayland-protocols', version: '>=1.13')
wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
wayland_scanner = find_program('wayland-scanner')
wayland_client = dependency('wayland-client')
Expand Down

0 comments on commit 6b9259b

Please sign in to comment.