mirror of
https://gitee.com/openharmony/third_party_libbpf
synced 2024-10-07 06:23:25 +00:00
vmtests: fix libc6 dependency and remove explicit libelf-dev install
Force libc6 dependency version. Drop explicit libelf-dev install command, as it should be pre-installed by Travis CI already, according to .travis.yaml. Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
This commit is contained in:
parent
4ccc1f0b9f
commit
9e123fa5d2
12
.travis.yml
12
.travis.yml
@ -36,7 +36,12 @@ stages:
|
|||||||
jobs:
|
jobs:
|
||||||
include:
|
include:
|
||||||
- stage: Builds & Tests
|
- stage: Builds & Tests
|
||||||
name: Kernel LATEST + selftests
|
name: Kernel 5.5.0 + selftests
|
||||||
|
language: bash
|
||||||
|
env: KERNEL=5.5.0
|
||||||
|
script: $CI_ROOT/vmtest/run_vmtest.sh || travis_terminate 1
|
||||||
|
|
||||||
|
- name: Kernel LATEST + selftests
|
||||||
language: bash
|
language: bash
|
||||||
env: KERNEL=LATEST
|
env: KERNEL=LATEST
|
||||||
script: $CI_ROOT/vmtest/run_vmtest.sh || travis_terminate 1
|
script: $CI_ROOT/vmtest/run_vmtest.sh || travis_terminate 1
|
||||||
@ -46,11 +51,6 @@ jobs:
|
|||||||
env: KERNEL=4.9.0
|
env: KERNEL=4.9.0
|
||||||
script: $CI_ROOT/vmtest/run_vmtest.sh || travis_terminate 1
|
script: $CI_ROOT/vmtest/run_vmtest.sh || travis_terminate 1
|
||||||
|
|
||||||
- name: Kernel 5.5.0 + selftests
|
|
||||||
language: bash
|
|
||||||
env: KERNEL=5.5.0
|
|
||||||
script: $CI_ROOT/vmtest/run_vmtest.sh || travis_terminate 1
|
|
||||||
|
|
||||||
- name: Debian Build
|
- name: Debian Build
|
||||||
language: bash
|
language: bash
|
||||||
install: $CI_ROOT/managers/debian.sh SETUP
|
install: $CI_ROOT/managers/debian.sh SETUP
|
||||||
|
@ -3,11 +3,8 @@ set -eux
|
|||||||
|
|
||||||
RELEASE="focal"
|
RELEASE="focal"
|
||||||
|
|
||||||
echo "deb-src http://archive.ubuntu.com/ubuntu/ $RELEASE main restricted universe multiverse" >>/etc/apt/sources.list
|
|
||||||
|
|
||||||
apt-get update
|
apt-get update
|
||||||
apt-get -y build-dep libelf-dev
|
apt-get install -y pkg-config
|
||||||
apt-get install -y libelf-dev pkg-config
|
|
||||||
|
|
||||||
source "$(dirname $0)/travis_wait.bash"
|
source "$(dirname $0)/travis_wait.bash"
|
||||||
|
|
||||||
|
@ -17,7 +17,9 @@ 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/focal/ llvm-toolchain-focal 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 --allow-downgrades -y libc6=2.31-0ubuntu9.2
|
||||||
|
sudo aptitude install -y g++ libelf-dev
|
||||||
|
sudo aptitude install -y clang-13 lld-13 llvm-13
|
||||||
|
|
||||||
travis_fold end install_clang
|
travis_fold end install_clang
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user