travis: Switch linux build from stretch to rawhide
Stretch's Mesa is too far behind, and building Mesa to build xserver is not the sort of problem we're trying to solve here. But our Travis scripts run inside a docker image, and that image can be whatever, so since I have to keep rawhide building anyway let's switch to that for now. The dockerfile can be found at: https://github.com/nwnk/xserver-travis The $DISTRO part of the change is foreshadowing for the day we readd a (probably sid-based) debian image; patches for other environments are welcome. Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
parent
17d30369f4
commit
1ca092f990
29
.travis.yml
29
.travis.yml
|
@ -2,24 +2,23 @@ language: c
|
||||||
cache: ccache
|
cache: ccache
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- os: linux
|
- os: linux
|
||||||
dist: trusty
|
dist: trusty
|
||||||
services: docker
|
services: docker
|
||||||
- os: osx
|
env: DISTRO=rawhide:v3
|
||||||
|
- os: osx
|
||||||
before_install:
|
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull anholt/xserver-travis ; fi
|
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache ; fi
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache ; fi
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM anholt/xserver-travis:v7 > Dockerfile ; fi
|
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull nwnk/xserver-travis-$DISTRO ; fi
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile ; fi
|
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM nwnk/xserver-travis-$DISTRO > Dockerfile ; fi
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit . ; fi
|
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile ; fi
|
||||||
|
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit . ; fi
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run --volume $HOME/.ccache:/root/.ccache withgit /bin/sh -c "cd /root && ./test/scripts/build-travis-deps.sh" ; fi
|
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run --volume $HOME/.ccache:/root/.ccache withgit /bin/sh -c "cd /root && ./test/scripts/build-travis-deps.sh" ; fi
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./test/scripts/build-travis-osx.sh ; fi
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./test/scripts/build-travis-osx.sh ; fi
|
||||||
- ccache -s
|
- ccache -s
|
||||||
|
|
|
@ -6,7 +6,9 @@ export PIGLIT_DIR=$TRAVIS_BUILD_DIR/piglit
|
||||||
export XTEST_DIR=$TRAVIS_BUILD_DIR/xtest
|
export XTEST_DIR=$TRAVIS_BUILD_DIR/xtest
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
set -x
|
||||||
|
|
||||||
meson --prefix=/usr build/
|
meson setup build/
|
||||||
|
meson configure -Dprefix=$PREFIX build/
|
||||||
ninja -C build/ install
|
ninja -C build/ install
|
||||||
ninja -C build/ test
|
ninja -C build/ test
|
||||||
|
|
Loading…
Reference in New Issue
Block a user