mirror of
https://github.com/zeromq/cppzmq.git
synced 2025-01-06 00:31:14 +01:00
Fix threading and build config
This commit is contained in:
parent
05fab99e64
commit
5822d39c51
11
.github/workflows/ci.yml
vendored
11
.github/workflows/ci.yml
vendored
@ -19,7 +19,6 @@ jobs:
|
|||||||
libzmq: ["4.3.4"]
|
libzmq: ["4.3.4"]
|
||||||
libzmqbuild: ["cmake"]
|
libzmqbuild: ["cmake"]
|
||||||
platform: [""]
|
platform: [""]
|
||||||
makeargs: ["-j2"]
|
|
||||||
include:
|
include:
|
||||||
# older libzmq and gcc without draft
|
# older libzmq and gcc without draft
|
||||||
- os: "ubuntu-18.04"
|
- os: "ubuntu-18.04"
|
||||||
@ -72,7 +71,6 @@ jobs:
|
|||||||
libzmq: "4.3.4"
|
libzmq: "4.3.4"
|
||||||
libzmqbuild: "cmake"
|
libzmqbuild: "cmake"
|
||||||
platform: "-Ax64"
|
platform: "-Ax64"
|
||||||
makeargs: ""
|
|
||||||
- os: "windows-latest"
|
- os: "windows-latest"
|
||||||
cppstd: "20"
|
cppstd: "20"
|
||||||
cc: "msbuild"
|
cc: "msbuild"
|
||||||
@ -81,7 +79,6 @@ jobs:
|
|||||||
libzmq: "4.3.4"
|
libzmq: "4.3.4"
|
||||||
libzmqbuild: "cmake"
|
libzmqbuild: "cmake"
|
||||||
platform: "-Ax64"
|
platform: "-Ax64"
|
||||||
makeargs: ""
|
|
||||||
|
|
||||||
env:
|
env:
|
||||||
CC: ${{ matrix.cc }}
|
CC: ${{ matrix.cc }}
|
||||||
@ -112,7 +109,7 @@ jobs:
|
|||||||
-DZMQ_BUILD_TESTS=OFF \
|
-DZMQ_BUILD_TESTS=OFF \
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
-DENABLE_DRAFTS=${{ matrix.drafts }}
|
-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}
|
echo "LIBZMQ=${PWD}/libzmq-build" >> ${GITHUB_ENV}
|
||||||
|
|
||||||
- name: build_libzmq_pkgconfig
|
- name: build_libzmq_pkgconfig
|
||||||
@ -121,7 +118,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
./autogen.sh &&
|
./autogen.sh &&
|
||||||
./configure --prefix=${PWD}/libzmq-build &&
|
./configure --prefix=${PWD}/libzmq-build &&
|
||||||
make ${{ matrix.makeargs }}
|
make -j ${THREADS}
|
||||||
make install
|
make install
|
||||||
echo "LIBZMQ=${PWD}/libzmq-build" >> ${GITHUB_ENV}
|
echo "LIBZMQ=${PWD}/libzmq-build" >> ${GITHUB_ENV}
|
||||||
|
|
||||||
@ -134,7 +131,7 @@ jobs:
|
|||||||
-DENABLE_DRAFTS=${{ matrix.drafts }} \
|
-DENABLE_DRAFTS=${{ matrix.drafts }} \
|
||||||
-DCOVERAGE=${COVERAGE} \
|
-DCOVERAGE=${COVERAGE} \
|
||||||
-DCMAKE_CXX_STANDARD=${{ matrix.cppstd }}
|
-DCMAKE_CXX_STANDARD=${{ matrix.cppstd }}
|
||||||
cmake --build build -- ${{ matrix.makeargs }}
|
cmake --build build --config ${BUILDTYPE} -j ${THREADS}
|
||||||
echo "CPPZMQ=${PWD}/build" >> ${GITHUB_ENV}
|
echo "CPPZMQ=${PWD}/build" >> ${GITHUB_ENV}
|
||||||
|
|
||||||
- name: test
|
- name: test
|
||||||
@ -153,6 +150,6 @@ jobs:
|
|||||||
cmake -H. -Bbuild ${{ matrix.platform}} \
|
cmake -H. -Bbuild ${{ matrix.platform}} \
|
||||||
-DCMAKE_BUILD_TYPE=${BUILDTYPE} \
|
-DCMAKE_BUILD_TYPE=${BUILDTYPE} \
|
||||||
-DCMAKE_CXX_STANDARD=${{ matrix.cppstd }}
|
-DCMAKE_CXX_STANDARD=${{ matrix.cppstd }}
|
||||||
cmake --build build -- ${{ matrix.makeargs }}
|
cmake --build build --config ${BUILDTYPE}
|
||||||
cd build
|
cd build
|
||||||
ctest -V -C ${BUILDTYPE}
|
ctest -V -C ${BUILDTYPE}
|
||||||
|
Loading…
Reference in New Issue
Block a user