diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a2d8e743ed..b926ca8ac0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,14 +10,17 @@ jobs: matrix: os: [ubuntu-latest, windows-latest, macOS-latest] buildType: [RelWithDebInfo] + proactor: [default] include: + - os: ubuntu-latest + proactor: libuv + cmake_extra: '-DPROACTOR=libuv' - os: windows-latest cmake_extra: '-A x64 -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake' cmake_generator: '-G "Visual Studio 16 2019"' - os: macOS-latest pkg_config_path: '/usr/local/opt/openssl@1.1/lib/pkgconfig' cmake_extra: '-DBUILD_RUBY=no -DTHREADERCISER=ON' - ctest_extra: '--exclude-regex c-threaderciser' env: BuildType: ${{matrix.buildType}} BuildDir: ${{github.workspace}}/BLD @@ -49,7 +52,7 @@ jobs: - name: Install Linux dependencies if: runner.os == 'Linux' run: | - sudo apt install -y swig libpython3-dev libsasl2-dev libjsoncpp-dev + sudo apt install -y swig libpython3-dev libsasl2-dev libjsoncpp-dev libuv1-dev - name: Install Windows dependencies if: runner.os == 'Windows' run: | diff --git a/.travis.yml b/.travis.yml index 1f20dfa3b7..a9cdd61f31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,7 +64,7 @@ jobs: # python-tox-test fails and ruby tests segfault - QPID_PROTON_CMAKE_ARGS='-DRUNTIME_CHECK=asan -DENABLE_TOX_TEST=OFF -DTHREADERCISER=ON' - QPID_PROTON_CTEST_ARGS='-E ^ruby.*' - - name: clang asan + - name: libuv clang asan os: linux dist: focal before_install: @@ -73,7 +73,7 @@ jobs: - CC=clang-11 - CXX=clang++-11 - PYTHON=python3 - - QPID_PROTON_CMAKE_ARGS='-DRUNTIME_CHECK=asan -DENABLE_TOX_TEST=OFF -DTHREADERCISER=ON' + - QPID_PROTON_CMAKE_ARGS='-DPROACTOR=libuv -DRUNTIME_CHECK=asan -DENABLE_TOX_TEST=OFF -DTHREADERCISER=ON' # otherwise, on Travis ldd gives `libclang_rt.asan-x86_64.so => not found` and binaries don't work - LD_LIBRARY_PATH=/usr/lib/llvm-11/lib/clang/11.0.0/lib/linux/ - name: gcc tsan @@ -88,6 +88,18 @@ jobs: # python-test, python-integration-test, and python-tox-test segfault - QPID_PROTON_CMAKE_ARGS='-DRUNTIME_CHECK=tsan -DENABLE_TOX_TEST=OFF -DTHREADERCISER=ON' - QPID_PROTON_CTEST_ARGS="-E 'python-test|python-integration-test'" + - name: gcc tsan libuv + os: linux + dist: focal + before_install: + - sudo apt-get install -y gcc-10 g++-10 + env: + - CC=gcc-10 + - CXX=g++-10 + - PYTHON=python3 + # python-test, python-integration-test, and python-tox-test segfault + - QPID_PROTON_CMAKE_ARGS='-DPROACTOR=libuv -DRUNTIME_CHECK=tsan -DENABLE_TOX_TEST=OFF -DTHREADERCISER=ON' + - QPID_PROTON_CTEST_ARGS="-E 'python-test|python-integration-test'" - name: coverage os: linux dist: bionic @@ -127,6 +139,7 @@ addons: apt: packages: - cmake + - libuv1-dev - libssl-dev - libsasl2-dev - sasl2-bin