From 8fd9b631ad57c9c210436681324bab01e6600172 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 6 May 2022 13:57:35 +0200 Subject: [PATCH] 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 Acked-by: Aaron Conole Reviewed-by: Ruifeng Wang --- .ci/linux-build.sh | 7 ++---- .github/workflows/build.yml | 22 +++++++++---------- config/arm/arm64_armv8_linux_clang_ubuntu | 19 ++++++++++++++++ config/arm/arm64_armv8_linux_clang_ubuntu1804 | 20 +---------------- config/ppc/ppc64le-power8-linux-gcc-ubuntu | 11 ++++++++++ .../ppc/ppc64le-power8-linux-gcc-ubuntu1804 | 12 +--------- 6 files changed, 44 insertions(+), 47 deletions(-) create mode 100644 config/arm/arm64_armv8_linux_clang_ubuntu mode change 100644 => 120000 config/arm/arm64_armv8_linux_clang_ubuntu1804 create mode 100644 config/ppc/ppc64le-power8-linux-gcc-ubuntu mode change 100644 => 120000 config/ppc/ppc64le-power8-linux-gcc-ubuntu1804 diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index 774a1441bf..2dea0c93fa 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -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 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 22daaabb91..812aa7055d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/config/arm/arm64_armv8_linux_clang_ubuntu b/config/arm/arm64_armv8_linux_clang_ubuntu new file mode 100644 index 0000000000..db488d75f4 --- /dev/null +++ b/config/arm/arm64_armv8_linux_clang_ubuntu @@ -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'] diff --git a/config/arm/arm64_armv8_linux_clang_ubuntu1804 b/config/arm/arm64_armv8_linux_clang_ubuntu1804 deleted file mode 100644 index db488d75f4..0000000000 --- a/config/arm/arm64_armv8_linux_clang_ubuntu1804 +++ /dev/null @@ -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'] diff --git a/config/arm/arm64_armv8_linux_clang_ubuntu1804 b/config/arm/arm64_armv8_linux_clang_ubuntu1804 new file mode 120000 index 0000000000..8e2e3fa9c0 --- /dev/null +++ b/config/arm/arm64_armv8_linux_clang_ubuntu1804 @@ -0,0 +1 @@ +arm64_armv8_linux_clang_ubuntu \ No newline at end of file diff --git a/config/ppc/ppc64le-power8-linux-gcc-ubuntu b/config/ppc/ppc64le-power8-linux-gcc-ubuntu new file mode 100644 index 0000000000..803c612cbc --- /dev/null +++ b/config/ppc/ppc64le-power8-linux-gcc-ubuntu @@ -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' diff --git a/config/ppc/ppc64le-power8-linux-gcc-ubuntu1804 b/config/ppc/ppc64le-power8-linux-gcc-ubuntu1804 deleted file mode 100644 index 803c612cbc..0000000000 --- a/config/ppc/ppc64le-power8-linux-gcc-ubuntu1804 +++ /dev/null @@ -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' diff --git a/config/ppc/ppc64le-power8-linux-gcc-ubuntu1804 b/config/ppc/ppc64le-power8-linux-gcc-ubuntu1804 new file mode 120000 index 0000000000..de90beb3c3 --- /dev/null +++ b/config/ppc/ppc64le-power8-linux-gcc-ubuntu1804 @@ -0,0 +1 @@ +ppc64le-power8-linux-gcc-ubuntu \ No newline at end of file