Skip to content

Commit

Permalink
ci,build: add Ubuntu 20.04 docker builds
Browse files Browse the repository at this point in the history
Ubuntu 20.04 should be out in a couple of weeks. But docker images are
currently available.
Start using them.
They get pulled from here:
   https://hub.docker.com/_/ubuntu

Also, Ubuntu 20.04 seems to start phasing out some Python2 stuff, so we
need to install python3-pip vs python-pip, which should work on older
distros as well.

Signed-off-by: Alexandru Ardelean <[email protected]>
  • Loading branch information
commodo committed Apr 2, 2020
1 parent a537703 commit 9ba5de1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ matrix:
dist: bionic
env:
- EXTRA_SSH=-oHostKeyAlgorithms=+ssh-dss
- os: linux
env:
- OS_TYPE=ubuntu_docker
- OS_VERSION=focal
- EXTRA_SSH=-oHostKeyAlgorithms=+ssh-dss
- compiler: "gcc"
os: osx
osx_image: xcode10.1
Expand Down
3 changes: 2 additions & 1 deletion CI/travis/before_install_linux
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ handle_default() {
sudo DEBIAN_FRONTEND=noninteractive apt-get install -y cmake graphviz \
libaio-dev libavahi-client-dev \
libavahi-common-dev libusb-1.0-0-dev libxml2-dev rpm tar \
bzip2 gzip flex bison git python-pip
bzip2 gzip flex bison git lsb-release python3-pip

if [ -n "${GH_DOC_TOKEN}" ] ; then
sudo apt-get install -y doxygen
fi
Expand Down

0 comments on commit 9ba5de1

Please sign in to comment.