diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-04-04 23:34:53 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-04-05 23:57:48 +0300 |
| commit | a1117487673b6db9d7fa0fa89ab488ffe8c6e6ee (patch) | |
| tree | fe1bba18433fb8f501805bd393e806288c64dc9c | |
| parent | d290301b4d9f92aeb4b0c2a1b5124484618e16eb (diff) | |
| download | meson-a1117487673b6db9d7fa0fa89ab488ffe8c6e6ee.zip meson-a1117487673b6db9d7fa0fa89ab488ffe8c6e6ee.tar.gz meson-a1117487673b6db9d7fa0fa89ab488ffe8c6e6ee.tar.bz2 | |
ci: Travis: Use the new mesonbuild/eoan image
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 34303b4..7ea7d54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,13 +44,13 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt ldc llvm ninja; fi # # Run one macOS build without pkg-config available, and the other (unity=on) with pkg-config - if [[ "$TRAVIS_OS_NAME" == "osx" && "$MESON_ARGS" =~ .*unity=on.* ]]; then brew install pkg-config; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull jpakkane/mesonci:eoan; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull mesonbuild/eoan; fi # We need to copy the current checkout inside the Docker container, # because it has the MR id to be tested checked out. script: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM jpakkane/mesonci:eoan > Dockerfile; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM mesonbuild/eoan > Dockerfile; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit .; fi - | @@ -58,7 +58,7 @@ script: ci_env=`bash <(curl -s https://codecov.io/env)` docker run --security-opt seccomp:unconfined $ci_env -v ${PWD}/.coverage:/root/.coverage \ withgit \ - /bin/sh -c "cd /root && mkdir -p tools; wget -c https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip -O /root/tools/ninja.zip; unzip -d /root/tools /root/tools/ninja.zip; chmod +x /root/tools/ninja; CC=$CC CXX=$CXX OBJC=$CC OBJCXX=$CXX PATH=/root/tools:$PATH ./run_tests.py $RUN_TESTS_ARGS -- $MESON_ARGS && chmod -R a+rwX .coverage" + /bin/bash -c "cd /root && source /ci/env_vars.sh && CC=$CC CXX=$CXX OBJC=$CC OBJCXX=$CXX PATH=/root/tools:$PATH ./run_tests.py $RUN_TESTS_ARGS -- $MESON_ARGS && chmod -R a+rwX .coverage" fi # Ensure that llvm is added after $PATH, otherwise the clang from that llvm install will be used instead of the native apple clang. - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib OBJC=$CC OBJCXX=$CXX PATH=$HOME/tools:/usr/local/opt/qt/bin:$PATH:$(brew --prefix llvm)/bin ./run_tests.py $RUN_TESTS_ARGS --backend=ninja -- $MESON_ARGS ; fi |