diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-11-10 16:03:49 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-11-11 07:42:40 -0800 |
| commit | fd27dfe649d9764eee5f0dfe63457db653db6414 (patch) | |
| tree | e0a4a55b807e0e8ce17c2d9101c9d123529fd94e /ci | |
| parent | 3ffe77ba2ca2e832af1a44ca7f3a65cbc1215713 (diff) | |
| download | meson-fd27dfe649d9764eee5f0dfe63457db653db6414.zip meson-fd27dfe649d9764eee5f0dfe63457db653db6414.tar.gz meson-fd27dfe649d9764eee5f0dfe63457db653db6414.tar.bz2 | |
travis: Drop osx support
We're now running this through github actions, no need for travis.
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/travis_install.sh | 17 | ||||
| -rwxr-xr-x | ci/travis_script.sh | 41 |
2 files changed, 15 insertions, 43 deletions
diff --git a/ci/travis_install.sh b/ci/travis_install.sh index d9d308a..bbeb100 100755 --- a/ci/travis_install.sh +++ b/ci/travis_install.sh @@ -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" diff --git a/ci/travis_script.sh b/ci/travis_script.sh index 7e26b52..e60e3a3 100755 --- a/ci/travis_script.sh +++ b/ci/travis_script.sh @@ -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 |