18.04 image is deprecated and will disappear soon.  Also some
slowdowns and brownouts are planned to push users away from
this deprecated version:

  https://github.com/actions/virtual-environments/issues/6002

Moving to 20.04.  Can't move to 22.04 at the moment because of
deprecation warnings from openssl 3.0.

Added missing dh-python dependency for debian.  And disabled
cast-align warnings also for GCC, since newer versions are
complaining about DPDK headers in the same way as Clang does.

Signed-off-by: Ilya Maximets <i.maxim...@ovn.org>
---
 .ci/linux-build.sh                   | 6 ++----
 .github/workflows/build-and-test.yml | 4 ++--
 debian/control                       | 1 +
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
index db63bfea1..e7e603040 100755
--- a/.ci/linux-build.sh
+++ b/.ci/linux-build.sh
@@ -190,10 +190,8 @@ if [ "$DPDK" ] || [ "$DPDK_SHARED" ]; then
         DPDK_VER="19.11.10"
     fi
     install_dpdk $DPDK_VER
-    if [ "$CC" = "clang" ]; then
-        # Disregard cast alignment errors until DPDK is fixed
-        CFLAGS_FOR_OVS="${CFLAGS_FOR_OVS} -Wno-cast-align"
-    fi
+    # Disregard cast alignment errors until DPDK is fixed
+    CFLAGS_FOR_OVS="${CFLAGS_FOR_OVS} -Wno-cast-align"
 fi
 
 if [ "$CC" = "clang" ]; then
diff --git a/.github/workflows/build-and-test.yml 
b/.github/workflows/build-and-test.yml
index 667cb27e8..9b951a07d 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -6,7 +6,7 @@ jobs:
   build-linux:
     env:
       dependencies: |
-        automake libtool gcc bc libjemalloc1 libjemalloc-dev    \
+        automake libtool gcc bc libjemalloc2 libjemalloc-dev    \
         libssl-dev llvm-dev libelf-dev libnuma-dev libpcap-dev  \
         python3-openssl python3-pip python3-sphinx              \
         selinux-policy-dev
@@ -25,7 +25,7 @@ jobs:
       TESTSUITE:   ${{ matrix.testsuite }}
 
     name: linux ${{ join(matrix.*, ' ') }}
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     timeout-minutes: 30
 
     strategy:
diff --git a/debian/control b/debian/control
index 6420b9d3e..27359a297 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: graphviz,
                bzip2,
                debhelper (>= 8),
                dh-autoreconf,
+               dh-python,
                libssl-dev,
                libtool,
                openssl,
-- 
2.34.3

_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to