diff options
-rw-r--r-- | .travis.yml | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index e6f7b21db4..4af46f4f3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,6 @@ matrix: include: - os: freebsd compiler: clang - - os: linux - compiler: gcc - env: CONTAINER=registry.cirno.systems/kiwi/containers/mpv-ci:stable-deps CI_SCRIPT=ci/build-tumbleweed.sh - - os: linux - compiler: clang - env: CONTAINER=registry.cirno.systems/kiwi/containers/mpv-ci:stable-deps CI_SCRIPT=ci/build-tumbleweed.sh fast_finish: true dist: focal @@ -33,7 +27,6 @@ branches: before_install: - if [ "$TRAVIS_COMPILER" = "clang" ]; then export CXX="clang++"; fi - if [ "$TRAVIS_COMPILER" = "gcc" ]; then export CXX="g++"; fi - - if [ -n "$CONTAINER" ]; then docker pull $CONTAINER; fi - | if [ "$TRAVIS_OS_NAME" = "freebsd" ]; then # Requested in ci/build-freebsd.sh @@ -73,14 +66,6 @@ before_install: script: - ./bootstrap.py - - | - if [ "$TRAVIS_OS_NAME" = "linux" ]; then - if [ -n "$CONTAINER" ]; then - docker run --env CC --env TARGET -v $TRAVIS_BUILD_DIR:/build $CONTAINER /bin/sh -c "cd /build && $CI_SCRIPT" - else - $CI_SCRIPT - fi - fi - if [ "$TRAVIS_OS_NAME" = "freebsd" ]; then ./ci/build-freebsd.sh; fi after_failure: cat ./build/config.log after_script: TOOLS/travis-rebuild-website |