diff options
| author | Jan Ekström <jeebjp@gmail.com> | 2018-07-29 11:55:48 +0300 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2018-07-29 12:07:43 +0300 |
| commit | 2d785f3ea39d6779a6ac44d85d7cdc0acf891f43 (patch) | |
| tree | 9a81eebde3b0bb4af96c46c36586664cede62d3b | |
| parent | 45beb7073a1cef89e87a2d562ce8c233fc140dae (diff) | |
| download | mpv-2d785f3ea39d6779a6ac44d85d7cdc0acf891f43.tar.bz2 mpv-2d785f3ea39d6779a6ac44d85d7cdc0acf891f43.tar.xz | |
ci: do bootstrap outside the docker container
This way the docker container in itself does no networking.
It seems like travis disabled network access from the actual docker
containers.
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | ci/build-mingw64.sh | 1 | ||||
| -rwxr-xr-x | ci/build-tumbleweed.sh | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index ddc8c51d6a..56d908d77c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,7 @@ branches: before_install: - docker pull $CONTAINER script: + - ./bootstrap.py - docker run --env CC --env TARGET -v $TRAVIS_BUILD_DIR:/build $CONTAINER /bin/sh -c "cd /build && $CI_SCRIPT" after_failure: cat ./build/config.log after_script: TOOLS/travis-rebuild-website diff --git a/ci/build-mingw64.sh b/ci/build-mingw64.sh index c60f70e421..3be2d9d9ad 100755 --- a/ci/build-mingw64.sh +++ b/ci/build-mingw64.sh @@ -16,7 +16,6 @@ export RANLIB=$TARGET-ranlib export CFLAGS="-O2 -mtune=intel -g -ggdb -pipe -Wall --param=ssp-buffer-size=4 -mms-bitfields -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fno-ident" export LDFLAGS="-Wl,--no-keep-memory -fstack-protector-strong" -./bootstrap.py ./waf configure \ --enable-static-build \ --enable-libmpv-shared \ diff --git a/ci/build-tumbleweed.sh b/ci/build-tumbleweed.sh index b7d6b56d56..c626aff660 100755 --- a/ci/build-tumbleweed.sh +++ b/ci/build-tumbleweed.sh @@ -1,7 +1,6 @@ #!/bin/sh set -e -./bootstrap.py ./waf configure \ --enable-cdda \ --enable-dvbin \ |