diff options
| -rw-r--r-- | .travis.yml | 11 | ||||
| -rw-r--r-- | Dockerfile.tumbleweed | 4 | ||||
| -rwxr-xr-x | ci-build.sh | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 3a1c2548..d41175ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ dist: bionic -sudo: required language: bash services: @@ -31,8 +30,14 @@ matrix: - PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig:$PKG_CONFIG_PATH" before_install: - - if [ "$TRAVIS_OS_NAME" = "linux" ]; then - docker build -f Dockerfile."$BUILD_FLAVOR" -t profanity .; + - > + if [ "$TRAVIS_OS_NAME" = "linux" ]; then + # Ensure that Travis uses the latest version of Docker. + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - + sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + sudo apt-get update + sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce + docker build -f Dockerfile."$BUILD_FLAVOR" -t profanity . fi script: diff --git a/Dockerfile.tumbleweed b/Dockerfile.tumbleweed index f7faf4a8..9acf4cce 100644 --- a/Dockerfile.tumbleweed +++ b/Dockerfile.tumbleweed @@ -1,7 +1,5 @@ # Build the latest openSUSE Tumbleweed image -# we have to pin this for now.. -# see https://github.com/profanity-im/profanity/issues/1294 -FROM registry.opensuse.org/opensuse/tumbleweed:20200324 +FROM opensuse/tumbleweed # expect - for functional tests # libmicrohttpd - for stabber diff --git a/ci-build.sh b/ci-build.sh index 2dbe8311..438388b0 100755 --- a/ci-build.sh +++ b/ci-build.sh @@ -14,7 +14,7 @@ trap error_handler ERR ./bootstrap.sh tests=() -MAKE="make" +MAKE="make --quiet -j$(nproc)" CC="gcc" case $(uname | tr '[:upper:]' '[:lower:]') in |