diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-11-12 20:36:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-12 20:36:27 +0200 |
| commit | 41a79a0757eadf74ea6c3d8985400c56083b68cb (patch) | |
| tree | c1711634c1a007a74e826188a606f0de483e5c77 /ci | |
| parent | d2aac3d80984b51919ecc39e50d5cec32b264580 (diff) | |
| parent | 33729240076d6b812116374edc5defbdaffcebbf (diff) | |
| download | meson-41a79a0757eadf74ea6c3d8985400c56083b68cb.tar.gz | |
Merge pull request #7965 from dcbaker/wip/2020-11/macos-github-actions
Migrate osx CI from travis to github actions
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 d9d308a45..bbeb1006a 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 7e26b5232..e60e3a3c7 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 |