Commit ed44f9cd authored by Michel Dänzer's avatar Michel Dänzer Committed by Michel Dänzer

Drop Travis Linux build in favour of GitLab CI

Fold build-travis-deps.sh into .gitlab-ci.yml.

Preparation for the next change, which would break the Travis Linux
build.
Reviewed-by: Eric Anholt's avatarEric Anholt <eric@anholt.net>
parent 0e541b10
......@@ -5,5 +5,23 @@ job:
when: on_failure
paths:
- build/test/piglit-results/
variables:
PIGLIT_DIR: /root/piglit
XTEST_DIR: /root/xts
script:
- ./test/scripts/build-travis-deps.sh
- |
cat > $PIGLIT_DIR/piglit.conf << _EOF_
[xts]
path=$XTEST_DIR
_EOF_
- cp test/tetexec.cfg $XTEST_DIR/xts5
- meson -Dprefix=/usr build/
- |
ninja -C build/ install
set +e
set -x
ninja -C build/ test
status=$?
cat build/meson-logs/testlog.txt
cat build/test/piglit-results/xvfb/long-summary || :
exit $status
......@@ -6,24 +6,13 @@ branches:
matrix:
include:
- os: linux
dist: trusty
services: docker
env: DISTRO=rawhide:v5
- os: osx
osx_image: xcode9.2
env: DISTRO=xcode9.2
install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache ; fi
before_script:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull nwnk/xserver-travis-$DISTRO ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM nwnk/xserver-travis-$DISTRO > Dockerfile ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit . ; fi
- HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache
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" == "osx" ]]; then ./test/scripts/build-travis-osx.sh ; fi
- ./test/scripts/build-travis-osx.sh
- ccache -s
#!/bin/sh
export PREFIX=/usr
export TRAVIS_BUILD_DIR=/root
export PIGLIT_DIR=$TRAVIS_BUILD_DIR/piglit
export XTEST_DIR=$TRAVIS_BUILD_DIR/xts
cat > "$PIGLIT_DIR"/piglit.conf << _EOF_
[xts]
path=$XTEST_DIR
_EOF_
# awful
cp test/tetexec.cfg $XTEST_DIR/xts5
set -x
meson -Dprefix=$PREFIX build/
ninja -C build/ install
ninja -C build/ test
status=$?
cat build/meson-logs/testlog.txt
cat build/test/piglit-results/xvfb/long-summary || :
# there should be a better way of extracting results, but:
# find build/test/piglit-results/xvfb/ | grep setfontpath | xargs cat
# isn't the worst thing ever
exit $status
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment