generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2024-12-13 10:52:57 +01:00
Code Issues Projects Releases Wiki Activity

Fix threading and build config

Browse Source
This commit is contained in:
Gudmundur Adalsteinsson 2021-07-14 11:44:07 +00:00
parent 05fab99e64
commit 5822d39c51
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/ci.yml vendored
View File

@ -19,7 +19,6 @@ jobs:
libzmq: ["4.3.4"]
libzmqbuild: ["cmake"]
platform: [""]
makeargs: ["-j2"]
include:
# older libzmq and gcc without draft
- os: "ubuntu-18.04"
@ -72,7 +71,6 @@ jobs:
libzmq: "4.3.4"
libzmqbuild: "cmake"
platform: "-Ax64"
makeargs: ""
- os: "windows-latest"
cppstd: "20"
cc: "msbuild"
@ -81,7 +79,6 @@ jobs:
libzmq: "4.3.4"
libzmqbuild: "cmake"
platform: "-Ax64"
makeargs: ""
env:
CC: ${{ matrix.cc }}
@ -112,7 +109,7 @@ jobs:
-DZMQ_BUILD_TESTS=OFF \
-DCMAKE_BUILD_TYPE=Release \
-DENABLE_DRAFTS=${{ matrix.drafts }}
cmake --build libzmq-build -- ${{ matrix.makeargs }}
cmake --build libzmq-build --config ${BUILDTYPE} -j ${THREADS}
echo "LIBZMQ=${PWD}/libzmq-build" >> ${GITHUB_ENV}
- name: build_libzmq_pkgconfig
@ -121,7 +118,7 @@ jobs:
run: |
./autogen.sh &&
./configure --prefix=${PWD}/libzmq-build &&
make ${{ matrix.makeargs }}
make -j ${THREADS}
make install
echo "LIBZMQ=${PWD}/libzmq-build" >> ${GITHUB_ENV}
@ -134,7 +131,7 @@ jobs:
-DENABLE_DRAFTS=${{ matrix.drafts }} \
-DCOVERAGE=${COVERAGE} \
-DCMAKE_CXX_STANDARD=${{ matrix.cppstd }}
cmake --build build -- ${{ matrix.makeargs }}
cmake --build build --config ${BUILDTYPE} -j ${THREADS}
echo "CPPZMQ=${PWD}/build" >> ${GITHUB_ENV}
- name: test
@ -153,6 +150,6 @@ jobs:
cmake -H. -Bbuild ${{ matrix.platform}} \
-DCMAKE_BUILD_TYPE=${BUILDTYPE} \
-DCMAKE_CXX_STANDARD=${{ matrix.cppstd }}
cmake --build build -- ${{ matrix.makeargs }}
cmake --build build --config ${BUILDTYPE}
cd build
ctest -V -C ${BUILDTYPE}