1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-07-14 18:14:15 -04:00

Use latest Docker in CI

Force a Docker upgrade for all Linux runners.

Fixes: #1294
This commit is contained in:
William Wennerström 2020-03-30 18:51:45 +02:00
parent 6c17a36465
commit bec7189295
No known key found for this signature in database
GPG Key ID: E1382990BEDD319B
3 changed files with 10 additions and 7 deletions

View File

@ -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:

View File

@ -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

View File

@ -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