Skip to content

Commit f58b56e

Browse files
committed
travis: Use Ubuntu LTS Bionic
instead of the older LTS Xenial, which is the default on Travis. This allows to remove upgrade docker from docker upstream repository for new distros (openSUSE Tumbleweed, Fedora), which speedup the build. Signed-off-by: Petr Vorel <[email protected]>
1 parent 1fb6c0a commit f58b56e

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

.travis.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Copyright (c) 2017-2020 Petr Vorel <[email protected]>
22

3+
dist: bionic
34
sudo: required
45
language: c
56
services:
@@ -101,14 +102,4 @@ script:
101102
- if [ "$MAKE_INSTALL" = 1 ]; then INSTALL_OPT="-i"; fi
102103
- if [ ! "$TREE" ]; then TREE="in"; fi
103104
- case $VARIANT in cross-compile*) BUILD="cross";; i386) BUILD="32";; *) BUILD="native";; esac
104-
105-
# Tumbleweed requires newer Docker version
106-
- >
107-
if [ "${DISTRO//*\/}" = "tumbleweed" -o "$INSTALL" = "fedora" ]; then
108-
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
109-
sudo add-apt-repository "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
110-
sudo apt-get update
111-
sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
112-
fi
113-
114105
- docker run -t ltp /bin/sh -c "cd travis && ./$INSTALL.sh && if [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./$INSTALL.$VARIANT.sh; fi && ../build.sh -o $TREE -t $BUILD -c $CC $INSTALL_OPT"

0 commit comments

Comments
 (0)