mirror/libbpf
1
0
Fork 0
mirror of https://github.com/netdata/libbpf.git synced 2026-04-07 17:19:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

travis-ci: switch from GCC8 to GCC10

Browse Source 
GCC 8 builds started failing due to missing gcc-8 package. Let's switch to GCC
10 instead.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
This commit is contained in:
Andrii Nakryiko
2021-02-22 11:42:57 -08:00
committed by Andrii Nakryiko
parent f2a926ba46
commit e1a90f3768
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@@ -75,16 +75,16 @@ jobs:
script: $CI_ROOT/managers/debian.sh RUN_CLANG_ASAN || travis_terminate 1 script: $CI_ROOT/managers/debian.sh RUN_CLANG_ASAN || travis_terminate 1
after_script: $CI_ROOT/managers/debian.sh CLEANUP after_script: $CI_ROOT/managers/debian.sh CLEANUP
- name: Debian Build (gcc-8) - name: Debian Build (gcc-10)
language: bash language: bash
install: $CI_ROOT/managers/debian.sh SETUP install: $CI_ROOT/managers/debian.sh SETUP
script: $CI_ROOT/managers/debian.sh RUN_GCC8 || travis_terminate 1 script: $CI_ROOT/managers/debian.sh RUN_GCC10 || travis_terminate 1
after_script: $CI_ROOT/managers/debian.sh CLEANUP after_script: $CI_ROOT/managers/debian.sh CLEANUP
- name: Debian Build (gcc-8 ASan+UBSan) - name: Debian Build (gcc-10 ASan+UBSan)
language: bash language: bash
install: $CI_ROOT/managers/debian.sh SETUP install: $CI_ROOT/managers/debian.sh SETUP
script: $CI_ROOT/managers/debian.sh RUN_GCC8_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 Bionic Build

10
travis-ci/managers/debian.sh
View File

@@ -6,7 +6,7 @@ CONT_NAME="${CONT_NAME:-libbpf-debian-$DEBIAN_RELEASE}"
ENV_VARS="${ENV_VARS:-}" ENV_VARS="${ENV_VARS:-}"
DOCKER_RUN="${DOCKER_RUN:-docker run}" DOCKER_RUN="${DOCKER_RUN:-docker run}"
REPO_ROOT="${REPO_ROOT:-$PWD}" REPO_ROOT="${REPO_ROOT:-$PWD}"
ADDITIONAL_DEPS=(clang pkg-config gcc-8) ADDITIONAL_DEPS=(clang pkg-config gcc-10)
CFLAGS="-g -O2 -Werror -Wall" CFLAGS="-g -O2 -Werror -Wall"
function info() { function info() {
@@ -45,13 +45,13 @@ for phase in "${PHASES[@]}"; do
docker_exec apt-get -y install libelf-dev docker_exec apt-get -y install libelf-dev
docker_exec apt-get -y install "${ADDITIONAL_DEPS[@]}" docker_exec apt-get -y install "${ADDITIONAL_DEPS[@]}"
;; ;;
RUN|RUN_CLANG|RUN_GCC8|RUN_ASAN|RUN_CLANG_ASAN|RUN_GCC8_ASAN) RUN|RUN_CLANG|RUN_GCC10|RUN_ASAN|RUN_CLANG_ASAN|RUN_GCC10_ASAN)
if [[ "$phase" = *"CLANG"* ]]; then if [[ "$phase" = *"CLANG"* ]]; then
ENV_VARS="-e CC=clang -e CXX=clang++" ENV_VARS="-e CC=clang -e CXX=clang++"
CC="clang" CC="clang"
elif [[ "$phase" = *"GCC8"* ]]; then elif [[ "$phase" = *"GCC10"* ]]; then
ENV_VARS="-e CC=gcc-8 -e CXX=g++-8" ENV_VARS="-e CC=gcc-10 -e CXX=g++-10"
CC="gcc-8" CC="gcc-10"
else else
CFLAGS="${CFLAGS} -Wno-stringop-truncation" CFLAGS="${CFLAGS} -Wno-stringop-truncation"
fi fi