mirror of
https://github.com/profanity-im/profanity.git
synced 2025-01-03 14:57:42 -05:00
Use latest Docker in CI
Force a Docker upgrade for all Linux runners. Fixes: #1294
This commit is contained in:
parent
6c17a36465
commit
bec7189295
11
.travis.yml
11
.travis.yml
@ -1,5 +1,4 @@
|
|||||||
dist: bionic
|
dist: bionic
|
||||||
sudo: required
|
|
||||||
language: bash
|
language: bash
|
||||||
|
|
||||||
services:
|
services:
|
||||||
@ -31,8 +30,14 @@ matrix:
|
|||||||
- PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig:$PKG_CONFIG_PATH"
|
- PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||||
|
|
||||||
before_install:
|
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
|
fi
|
||||||
|
|
||||||
script:
|
script:
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
# Build the latest openSUSE Tumbleweed image
|
# Build the latest openSUSE Tumbleweed image
|
||||||
# we have to pin this for now..
|
FROM opensuse/tumbleweed
|
||||||
# see https://github.com/profanity-im/profanity/issues/1294
|
|
||||||
FROM registry.opensuse.org/opensuse/tumbleweed:20200324
|
|
||||||
|
|
||||||
# expect - for functional tests
|
# expect - for functional tests
|
||||||
# libmicrohttpd - for stabber
|
# libmicrohttpd - for stabber
|
||||||
|
@ -14,7 +14,7 @@ trap error_handler ERR
|
|||||||
./bootstrap.sh
|
./bootstrap.sh
|
||||||
|
|
||||||
tests=()
|
tests=()
|
||||||
MAKE="make"
|
MAKE="make --quiet -j$(nproc)"
|
||||||
CC="gcc"
|
CC="gcc"
|
||||||
|
|
||||||
case $(uname | tr '[:upper:]' '[:lower:]') in
|
case $(uname | tr '[:upper:]' '[:lower:]') in
|
||||||
|
Loading…
Reference in New Issue
Block a user