Skip to content

Commit 5822d39

Browse files
committed
Fix threading and build config
1 parent 05fab99 commit 5822d39

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
libzmq: ["4.3.4"]
2020
libzmqbuild: ["cmake"]
2121
platform: [""]
22-
makeargs: ["-j2"]
2322
include:
2423
# older libzmq and gcc without draft
2524
- os: "ubuntu-18.04"
@@ -72,7 +71,6 @@ jobs:
7271
libzmq: "4.3.4"
7372
libzmqbuild: "cmake"
7473
platform: "-Ax64"
75-
makeargs: ""
7674
- os: "windows-latest"
7775
cppstd: "20"
7876
cc: "msbuild"
@@ -81,7 +79,6 @@ jobs:
8179
libzmq: "4.3.4"
8280
libzmqbuild: "cmake"
8381
platform: "-Ax64"
84-
makeargs: ""
8582

8683
env:
8784
CC: ${{ matrix.cc }}
@@ -112,7 +109,7 @@ jobs:
112109
-DZMQ_BUILD_TESTS=OFF \
113110
-DCMAKE_BUILD_TYPE=Release \
114111
-DENABLE_DRAFTS=${{ matrix.drafts }}
115-
cmake --build libzmq-build -- ${{ matrix.makeargs }}
112+
cmake --build libzmq-build --config ${BUILDTYPE} -j ${THREADS}
116113
echo "LIBZMQ=${PWD}/libzmq-build" >> ${GITHUB_ENV}
117114
118115
- name: build_libzmq_pkgconfig
@@ -121,7 +118,7 @@ jobs:
121118
run: |
122119
./autogen.sh &&
123120
./configure --prefix=${PWD}/libzmq-build &&
124-
make ${{ matrix.makeargs }}
121+
make -j ${THREADS}
125122
make install
126123
echo "LIBZMQ=${PWD}/libzmq-build" >> ${GITHUB_ENV}
127124
@@ -134,7 +131,7 @@ jobs:
134131
-DENABLE_DRAFTS=${{ matrix.drafts }} \
135132
-DCOVERAGE=${COVERAGE} \
136133
-DCMAKE_CXX_STANDARD=${{ matrix.cppstd }}
137-
cmake --build build -- ${{ matrix.makeargs }}
134+
cmake --build build --config ${BUILDTYPE} -j ${THREADS}
138135
echo "CPPZMQ=${PWD}/build" >> ${GITHUB_ENV}
139136
140137
- name: test
@@ -153,6 +150,6 @@ jobs:
153150
cmake -H. -Bbuild ${{ matrix.platform}} \
154151
-DCMAKE_BUILD_TYPE=${BUILDTYPE} \
155152
-DCMAKE_CXX_STANDARD=${{ matrix.cppstd }}
156-
cmake --build build -- ${{ matrix.makeargs }}
153+
cmake --build build --config ${BUILDTYPE}
157154
cd build
158155
ctest -V -C ${BUILDTYPE}

0 commit comments

Comments
 (0)