Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NO-JIRA (yet) Add -DPROACTOR=libuv jobs in GHA and TravisCI #299

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]/lib/pkgconfig'
cmake_extra: '-DBUILD_RUBY=no -DTHREADERCISER=ON'
ctest_extra: '--exclude-regex c-threaderciser'
env:
BuildType: ${{matrix.buildType}}
BuildDir: ${{github.workspace}}/BLD
Expand Down Expand Up @@ -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: |
Expand Down
17 changes: 15 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -127,6 +139,7 @@ addons:
apt:
packages:
- cmake
- libuv1-dev
- libssl-dev
- libsasl2-dev
- sasl2-bin
Expand Down