On 3/15/23 07:29, Ales Musil wrote:
> Move the ci.sh script into .ci folder
> and remove the linux-prepare.sh as it
> is no longer needed with all the requirements
> installed in container.
> 
> Signed-off-by: Ales Musil <[email protected]>
> ---
>  {utilities/containers => .ci}/ci.sh |  0
>  .ci/linux-prepare.sh                | 21 -----------
>  .github/workflows/test.yml          | 54 ++---------------------------
>  Makefile.am                         |  2 +-
>  utilities/automake.mk               |  1 -
>  5 files changed, 3 insertions(+), 75 deletions(-)
>  rename {utilities/containers => .ci}/ci.sh (100%)
>  delete mode 100755 .ci/linux-prepare.sh
> 
> diff --git a/utilities/containers/ci.sh b/.ci/ci.sh
> similarity index 100%
> rename from utilities/containers/ci.sh
> rename to .ci/ci.sh
> diff --git a/.ci/linux-prepare.sh b/.ci/linux-prepare.sh
> deleted file mode 100755
> index 6617d0c42..000000000
> --- a/.ci/linux-prepare.sh
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -#!/bin/bash
> -
> -set -ev
> -
> -# Build and install sparse.
> -#
> -# Explicitly disable sparse support for llvm because some travis
> -# environments claim to have LLVM (llvm-config exists and works) but
> -# linking against it fails.
> -# Disabling sqlite support because sindex build fails and we don't
> -# really need this utility being installed.
> -git clone git://git.kernel.org/pub/scm/devel/sparse/sparse.git
> -cd sparse && make -j4 HAVE_LLVM= HAVE_SQLITE= install && cd ..
> -
> -# Installing wheel separately because it may be needed to build some
> -# of the packages during dependency backtracking and pip >= 22.0 will
> -# abort backtracking on build failures:
> -#     https://github.com/pypa/pip/issues/10655
> -pip3 install --disable-pip-version-check --user wheel
> -pip3 install --disable-pip-version-check --user \
> --r utilities/containers/py-requirements.txt
> diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
> index 90dc8a6f1..d8b39da2c 100644
> --- a/.github/workflows/test.yml
> +++ b/.github/workflows/test.yml
> @@ -14,11 +14,7 @@ concurrency:
>  jobs:
>    build-linux:
>      env:
> -      dependencies: |
> -        automake libtool gcc bc libjemalloc2 libjemalloc-dev    \
> -        libssl-dev llvm-dev libelf-dev libnuma-dev libpcap-dev  \
> -        selinux-policy-dev ncat python3-scapy isc-dhcp-server
> -      m32_dependecies: gcc-multilib
> +      IMAGE_NAME:  ghcr.io/ovn-org/ovn-tests:ubuntu
>        ARCH:        ${{ matrix.cfg.arch }}
>        CC:          ${{ matrix.cfg.compiler }}
>        LIBS:        ${{ matrix.cfg.libs }}
> @@ -56,7 +52,6 @@ jobs:
>          - { compiler: clang, testsuite: system-test, sanitizers: sanitizers, 
> test_range: "-100" }
>          - { compiler: clang, testsuite: system-test, sanitizers: sanitizers, 
> test_range: "101-200" }
>          - { compiler: clang, testsuite: system-test, sanitizers: sanitizers, 
> test_range: "201-" }
> -        - { arch: x86, compiler: gcc, opts: --disable-ssl }

Hmm.  So we drop support for 32bit builds?  This doesn't seem
to be mentioned anywhere.  And I'm not sure if that's the right
thing to do.

Best regards, Ilya Maximets.
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to