ci: switch to Ubuntu 20.04

Ubuntu 18.04 is now rather old.
Besides, other entities in our CI are also testing this distribution.

Switch to a newer Ubuntu release and benefit from more recent
tool(chain)s: for example, net/cnxk now builds fine and can be
re-enabled.

Note: Ubuntu 18.04 and 20.04 seem to preserve the same paths for the ARM
and PPC cross compilation toolchains, so we can use a single
configuration file (with the hope, future releases of Ubuntu will do the
same).

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Aaron Conole <aconole@redhat.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
This commit is contained in:
David Marchand 2022-05-06 13:57:35 +02:00
parent 28c5d60072
commit 8fd9b631ad
6 changed files with 44 additions and 47 deletions

View File

@ -57,18 +57,15 @@ catch_coredump() {
}
if [ "$AARCH64" = "true" ]; then
# Note: common/cnxk is disabled for Ubuntu 18.04
# https://bugs.dpdk.org/show_bug.cgi?id=697
OPTS="$OPTS -Ddisable_drivers=common/cnxk"
if [ "${CC%%clang}" != "$CC" ]; then
OPTS="$OPTS --cross-file config/arm/arm64_armv8_linux_clang_ubuntu1804"
OPTS="$OPTS --cross-file config/arm/arm64_armv8_linux_clang_ubuntu"
else
OPTS="$OPTS --cross-file config/arm/arm64_armv8_linux_gcc"
fi
fi
if [ "$PPC64LE" = "true" ]; then
OPTS="$OPTS --cross-file config/ppc/ppc64le-power8-linux-gcc-ubuntu1804"
OPTS="$OPTS --cross-file config/ppc/ppc64le-power8-linux-gcc-ubuntu"
fi
if [ "$BUILD_DOCS" = "true" ]; then

View File

@ -30,43 +30,41 @@ jobs:
fail-fast: false
matrix:
config:
- os: ubuntu-18.04
- os: ubuntu-20.04
compiler: gcc
library: static
- os: ubuntu-18.04
- os: ubuntu-20.04
compiler: gcc
library: shared
mini: mini
- os: ubuntu-18.04
- os: ubuntu-20.04
compiler: gcc
library: shared
checks: abi+doc+tests
- os: ubuntu-18.04
- os: ubuntu-20.04
compiler: clang
library: static
- os: ubuntu-18.04
- os: ubuntu-20.04
compiler: clang
library: shared
checks: doc+tests
- os: ubuntu-18.04
- os: ubuntu-20.04
compiler: gcc
library: static
cross: i386
# Note: common/cnxk is disabled for Ubuntu 18.04
# https://bugs.dpdk.org/show_bug.cgi?id=697
- os: ubuntu-18.04
- os: ubuntu-20.04
compiler: gcc
library: static
cross: aarch64
- os: ubuntu-18.04
- os: ubuntu-20.04
compiler: gcc
library: shared
cross: aarch64
- os: ubuntu-18.04
- os: ubuntu-20.04
compiler: gcc
library: static
cross: ppc64le
- os: ubuntu-18.04
- os: ubuntu-20.04
compiler: gcc
library: shared
cross: ppc64le

View File

@ -0,0 +1,19 @@
[binaries]
c = 'clang'
cpp = 'clang++'
ar = 'llvm-ar'
strip = 'llvm-strip'
llvm-config = 'llvm-config'
pcap-config = 'llvm-config'
pkgconfig = 'aarch64-linux-gnu-pkg-config'
[host_machine]
system = 'linux'
cpu_family = 'aarch64'
cpu = 'armv8-a'
endian = 'little'
[properties]
platform = 'generic'
c_args = ['-target', 'aarch64-linux-gnu', '--sysroot', '/usr/aarch64-linux-gnu']
c_link_args = ['-target', 'aarch64-linux-gnu', '-fuse-ld=lld', '--gcc-toolchain=/usr']

View File

@ -1,19 +0,0 @@
[binaries]
c = 'clang'
cpp = 'clang++'
ar = 'llvm-ar'
strip = 'llvm-strip'
llvm-config = 'llvm-config'
pcap-config = 'llvm-config'
pkgconfig = 'aarch64-linux-gnu-pkg-config'
[host_machine]
system = 'linux'
cpu_family = 'aarch64'
cpu = 'armv8-a'
endian = 'little'
[properties]
platform = 'generic'
c_args = ['-target', 'aarch64-linux-gnu', '--sysroot', '/usr/aarch64-linux-gnu']
c_link_args = ['-target', 'aarch64-linux-gnu', '-fuse-ld=lld', '--gcc-toolchain=/usr']

View File

@ -0,0 +1 @@
arm64_armv8_linux_clang_ubuntu

View File

@ -0,0 +1,11 @@
[binaries]
c = 'powerpc64le-linux-gnu-gcc'
cpp = 'powerpc64le-linux-gnu-cpp'
ar = 'powerpc64le-linux-gnu-ar'
strip = 'powerpc64le-linux-gnu-strip'
[host_machine]
system = 'linux'
cpu_family = 'ppc64'
cpu = 'power8'
endian = 'little'

View File

@ -1,11 +0,0 @@
[binaries]
c = 'powerpc64le-linux-gnu-gcc'
cpp = 'powerpc64le-linux-gnu-cpp'
ar = 'powerpc64le-linux-gnu-ar'
strip = 'powerpc64le-linux-gnu-strip'
[host_machine]
system = 'linux'
cpu_family = 'ppc64'
cpu = 'power8'
endian = 'little'

View File

@ -0,0 +1 @@
ppc64le-power8-linux-gcc-ubuntu