| Message ID | 20220506115736.8492-1-david.marchand@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | David Marchand |
| Headers | show |
| Series | [v2,1/2] ci: switch to Ubuntu 20.04 | expand |
| Context | Check | Description |
|---|---|---|
| ci/checkpatch | success | coding style OK |
> -----Original Message----- > From: David Marchand <david.marchand@redhat.com> > Sent: Friday, May 6, 2022 7:58 PM > To: dev@dpdk.org > Cc: Aaron Conole <aconole@redhat.com>; Michael Santana > <maicolgabriel@hotmail.com>; Ruifeng Wang <Ruifeng.Wang@arm.com>; > Jan Viktorin <viktorin@rehivetech.com>; Bruce Richardson > <bruce.richardson@intel.com>; David Christensen <drc@linux.vnet.ibm.com> > Subject: [PATCH v2 1/2] 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> > --- > Changes since v1: > - renamed ubuntu cross compilation configs for ARM and PPC, > > --- > .ci/linux-build.sh | 7 ++---- > .github/workflows/build.yml | 22 +++++++++---------- > ...ntu1804 => arm64_armv8_linux_clang_ubuntu} | 0 > ...tu1804 => ppc64le-power8-linux-gcc-ubuntu} | 0 > 4 files changed, 12 insertions(+), 17 deletions(-) rename > config/arm/{arm64_armv8_linux_clang_ubuntu1804 => > arm64_armv8_linux_clang_ubuntu} (100%) rename config/ppc/{ppc64le- > power8-linux-gcc-ubuntu1804 => ppc64le-power8-linux-gcc-ubuntu} (100%) > Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
On Sat, May 7, 2022 at 5:37 AM Ruifeng Wang <Ruifeng.Wang@arm.com> wrote: > > > -----Original Message----- > > From: David Marchand <david.marchand@redhat.com> > > Sent: Friday, May 6, 2022 7:58 PM > > To: dev@dpdk.org > > Cc: Aaron Conole <aconole@redhat.com>; Michael Santana > > <maicolgabriel@hotmail.com>; Ruifeng Wang <Ruifeng.Wang@arm.com>; > > Jan Viktorin <viktorin@rehivetech.com>; Bruce Richardson > > <bruce.richardson@intel.com>; David Christensen <drc@linux.vnet.ibm.com> > > Subject: [PATCH v2 1/2] 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> > > --- > > Changes since v1: > > - renamed ubuntu cross compilation configs for ARM and PPC, I had forgotten to amend the patch with links for the older config files. I fixed it. Thanks for the reviews, series applied.
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_ubuntu1804 b/config/arm/arm64_armv8_linux_clang_ubuntu similarity index 100% rename from config/arm/arm64_armv8_linux_clang_ubuntu1804 rename to config/arm/arm64_armv8_linux_clang_ubuntu diff --git a/config/ppc/ppc64le-power8-linux-gcc-ubuntu1804 b/config/ppc/ppc64le-power8-linux-gcc-ubuntu similarity index 100% rename from config/ppc/ppc64le-power8-linux-gcc-ubuntu1804 rename to config/ppc/ppc64le-power8-linux-gcc-ubuntu