travis-ci: update to Ubuntu Focal

Update to Ubuntu Focal 20.04.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
This commit is contained in:
Andrii Nakryiko
2021-02-01 21:01:22 -08:00
committed by Andrii Nakryiko
parent 915f3abe94
commit bab780e6f9
4 changed files with 20 additions and 8 deletions

View File

@@ -1,6 +1,6 @@
sudo: required sudo: required
language: bash language: bash
dist: bionic dist: focal
services: services:
- docker - docker
@@ -87,21 +87,21 @@ jobs:
script: $CI_ROOT/managers/debian.sh RUN_GCC10_ASAN || travis_terminate 1 script: $CI_ROOT/managers/debian.sh RUN_GCC10_ASAN || travis_terminate 1
after_script: $CI_ROOT/managers/debian.sh CLEANUP after_script: $CI_ROOT/managers/debian.sh CLEANUP
- name: Ubuntu Bionic Build - name: Ubuntu Focal Build
language: bash language: bash
script: sudo $CI_ROOT/managers/ubuntu.sh || travis_terminate 1 script: sudo $CI_ROOT/managers/ubuntu.sh || travis_terminate 1
- name: Ubuntu Bionic Build (arm) - name: Ubuntu Focal Build (arm)
arch: arm64 arch: arm64
language: bash language: bash
script: sudo $CI_ROOT/managers/ubuntu.sh || travis_terminate 1 script: sudo $CI_ROOT/managers/ubuntu.sh || travis_terminate 1
- name: Ubuntu Bionic Build (s390x) - name: Ubuntu Focal Build (s390x)
arch: s390x arch: s390x
language: bash language: bash
script: sudo $CI_ROOT/managers/ubuntu.sh || travis_terminate 1 script: sudo $CI_ROOT/managers/ubuntu.sh || travis_terminate 1
- name: Ubuntu Bionic Build (ppc64le) - name: Ubuntu Focal Build (ppc64le)
arch: ppc64le arch: ppc64le
language: bash language: bash
script: sudo $CI_ROOT/managers/ubuntu.sh || travis_terminate 1 script: sudo $CI_ROOT/managers/ubuntu.sh || travis_terminate 1
@@ -120,7 +120,7 @@ jobs:
- COVERITY_SCAN_BUILD_COMMAND_PREPEND="cd src/" - COVERITY_SCAN_BUILD_COMMAND_PREPEND="cd src/"
- COVERITY_SCAN_BUILD_COMMAND="make" - COVERITY_SCAN_BUILD_COMMAND="make"
install: install:
- sudo echo 'deb-src http://archive.ubuntu.com/ubuntu/ bionic main restricted universe multiverse' >>/etc/apt/sources.list - sudo echo 'deb-src http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse' >>/etc/apt/sources.list
- sudo apt-get update - sudo apt-get update
- sudo apt-get -y build-dep libelf-dev - sudo apt-get -y build-dep libelf-dev
- sudo apt-get install -y libelf-dev pkg-config - sudo apt-get install -y libelf-dev pkg-config

View File

@@ -31,6 +31,18 @@ for phase in "${PHASES[@]}"; do
info "Setup phase" info "Setup phase"
info "Using Debian $DEBIAN_RELEASE" info "Using Debian $DEBIAN_RELEASE"
# Install Docker Engine
sudo apt-get update
sudo apt-get install \
apt-transport-https \
ca-certificates \
curl \
gnupg-agent \
software-properties-common
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 sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
docker --version docker --version

View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -eux set -eux
RELEASE="bionic" RELEASE="focal"
echo "deb-src http://archive.ubuntu.com/ubuntu/ $RELEASE main restricted universe multiverse" >>/etc/apt/sources.list echo "deb-src http://archive.ubuntu.com/ubuntu/ $RELEASE main restricted universe multiverse" >>/etc/apt/sources.list

View File

@@ -15,7 +15,7 @@ ${VMTEST_ROOT}/build_pahole.sh travis-ci/vmtest/pahole
travis_fold start install_clang "Installing Clang/LLVM" travis_fold start install_clang "Installing Clang/LLVM"
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic main" sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal main"
sudo apt-get update sudo apt-get update
sudo apt-get install -y clang-13 lld-13 llvm-13 sudo apt-get install -y clang-13 lld-13 llvm-13