walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #1711 from nghttp2/fix-nproc 

nproc is not available on macos
This commit is contained in:
Tatsuhiro Tsujikawa 2022-05-15 18:11:04 +09:00 committed by GitHub
parent ae1de00c91 267ce93a7e
commit 974a614020
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/build.yml vendored
View File

@ -100,7 +100,7 @@ jobs:
git clone --depth 1 -b OpenSSL_1_1_1o+quic https://github.com/quictls/openssl git clone --depth 1 -b OpenSSL_1_1_1o+quic https://github.com/quictls/openssl
cd openssl cd openssl
./config --prefix=$PWD/build ./config --prefix=$PWD/build
make -j$(nproc) make -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)"
make install_sw make install_sw
- name: Build quictls/openssl v3.0.x - name: Build quictls/openssl v3.0.x
if: matrix.http3 == 'http3' && matrix.openssl == 'openssl3' if: matrix.http3 == 'http3' && matrix.openssl == 'openssl3'
@ -111,7 +111,7 @@ jobs:
git clone --depth 1 -b openssl-3.0.3+quic https://github.com/quictls/openssl git clone --depth 1 -b openssl-3.0.3+quic https://github.com/quictls/openssl
cd openssl cd openssl
./config enable-ktls --prefix=$PWD/build --libdir=$PWD/build/lib ./config enable-ktls --prefix=$PWD/build --libdir=$PWD/build/lib
make -j$(nproc) make -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)"
make install_sw make install_sw
- name: Build nghttp3 - name: Build nghttp3
if: matrix.http3 == 'http3' if: matrix.http3 == 'http3'
@ -120,7 +120,7 @@ jobs:
cd nghttp3 cd nghttp3
autoreconf -i autoreconf -i
./configure --prefix=$PWD/build --enable-lib-only ./configure --prefix=$PWD/build --enable-lib-only
make -j$(nproc) check make -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)" check
make install make install
- name: Build ngtcp2 - name: Build ngtcp2
if: matrix.http3 == 'http3' if: matrix.http3 == 'http3'
@ -129,7 +129,7 @@ jobs:
cd ngtcp2 cd ngtcp2
autoreconf -i autoreconf -i
./configure --prefix=$PWD/build --enable-lib-only PKG_CONFIG_PATH="../openssl/build/lib/pkgconfig" ./configure --prefix=$PWD/build --enable-lib-only PKG_CONFIG_PATH="../openssl/build/lib/pkgconfig"
make -j$(nproc) check make -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)" check
make install make install
- name: Setup extra environment variables for HTTP/3 - name: Setup extra environment variables for HTTP/3
if: matrix.http3 == 'http3' if: matrix.http3 == 'http3'