travis: Drop osx support

We're now running this through github actions, no need for travis.
0.56
Dylan Baker 4 years ago committed by Nirbheek Chauhan
parent 83149f1f63
commit 3aef33a99a
  1. 5
      .travis.yml
  2. 17
      ci/travis_install.sh
  3. 41
      ci/travis_script.sh

@ -8,7 +8,6 @@ branches:
os:
- linux
- osx
compiler:
- gcc
@ -25,10 +24,6 @@ services:
- docker
matrix:
exclude:
# On OS X gcc is just a wrapper around clang, so don't waste time testing that
- os: osx
compiler: gcc
include:
# Test cross builds separately, they do not use the global compiler
# Also hijack one cross build to test long commandline handling codepath (and avoid overloading Travis)

@ -4,19 +4,6 @@ set -e
msg() { echo -e "\x1b[1;32mINFO: \x1b[37m$*\x1b[0m"; }
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
msg "Running OSX setup"
brew update
# Run one macOS build with pkg-config available (pulled in by qt), and the
# other (unity=on) without pkg-config
brew install qt ldc llvm ninja
if [[ "$MESON_ARGS" =~ .*unity=on.* ]]; then
which pkg-config && rm -f $(which pkg-config)
fi
python3 -m pip install jsonschema
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
msg "Running Linux setup"
docker pull mesonbuild/eoan
fi
msg "Running Linux setup"
docker pull mesonbuild/eoan
msg "Setup finished"

@ -4,16 +4,15 @@ set -e
msg() { echo -e "\x1b[1;32mINFO: \x1b[37m$*\x1b[0m"; }
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
# TODO enable coverage
#curl -s https://codecov.io/bash > upload.sh
#chmod +x upload.sh
# TODO enable coverage
#curl -s https://codecov.io/bash > upload.sh
#chmod +x upload.sh
# We need to copy the current checkout inside the Docker container,
# because it has the MR id to be tested checked out.
# We need to copy the current checkout inside the Docker container,
# because it has the MR id to be tested checked out.
msg "Generating runner:"
cat <<EOF | tee run.sh
msg "Generating runner:"
cat <<EOF | tee run.sh
#!/bin/bash
set -e
@ -50,23 +49,9 @@ ADD . /root
EOF
msg "Building the docker image..."
docker build -t test_img .
msg "Start running tests"
#ci_env=`bash <(curl -s https://codecov.io/env)`
docker run --security-opt seccomp:unconfined test_img /root/run.sh
elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
# Ensure that llvm is added after $PATH, otherwise the clang from that llvm install will be used instead of the native apple clang.
export SDKROOT=$(xcodebuild -version -sdk macosx Path)
export CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib
export OBJC=$CC
export OBJCXX=$CXX
export PATH=$HOME/tools:/usr/local/opt/qt/bin:$PATH:$(brew --prefix llvm)/bin
if test "$MESON_RSP_THRESHOLD" != ""
then
export MESON_RSP_THRESHOLD=$MESON_RSP_THRESHOLD
fi
./run_tests.py $RUN_TESTS_ARGS --backend=ninja -- $MESON_ARGS
fi
msg "Building the docker image..."
docker build -t test_img .
msg "Start running tests"
#ci_env=`bash <(curl -s https://codecov.io/env)`
docker run --security-opt seccomp:unconfined test_img /root/run.sh

Loading…
Cancel
Save