diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2023-10-12 22:01:23 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2023-10-12 22:01:23 +1100 |
| commit | 637624dbbac13f2bc3c8ec5b15c9d627d07f2935 (patch) | |
| tree | 667a23999bbcd04067c1e39482f64fc15fa3cf01 | |
| parent | 971e0cfcfd52ef1d73cf5244074c306a60006e89 (diff) | |
Don't use make -j2.
While we have 2 cores available on github runners, not using it means
that the most recent log message is the actual failure, rather than
having to search back through the log for it.
| -rwxr-xr-x | .github/setup_ci.sh | 6 | ||||
| -rw-r--r-- | .github/workflows/c-cpp.yml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh index 010a333a..9e6d6d62 100755 --- a/.github/setup_ci.sh +++ b/.github/setup_ci.sh @@ -176,7 +176,7 @@ if [ "${INSTALL_HARDENED_MALLOC}" = "yes" ]; then (cd ${HOME} && git clone https://github.com/GrapheneOS/hardened_malloc.git && cd ${HOME}/hardened_malloc && - make -j2 && sudo cp out/libhardened_malloc.so /usr/lib/) + make && sudo cp out/libhardened_malloc.so /usr/lib/) fi if [ ! -z "${INSTALL_OPENSSL}" ]; then @@ -197,14 +197,14 @@ if [ ! -z "${INSTALL_LIBRESSL}" ]; then git checkout ${INSTALL_LIBRESSL} && sh update.sh && sh autogen.sh && ./configure --prefix=/opt/libressl && - make -j2 && sudo make install) + make && sudo make install) else LIBRESSL_URLBASE=https://cdn.openbsd.org/pub/OpenBSD/LibreSSL (cd ${HOME} && wget ${LIBRESSL_URLBASE}/libressl-${INSTALL_LIBRESSL}.tar.gz && tar xfz libressl-${INSTALL_LIBRESSL}.tar.gz && cd libressl-${INSTALL_LIBRESSL} && - ./configure --prefix=/opt/libressl && make -j2 && sudo make install) + ./configure --prefix=/opt/libressl && make && sudo make install) fi fi diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index be0c97f8..ca6a0a54 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -108,7 +108,7 @@ jobs: - name: make clean run: make clean - name: make - run: make -j2 + run: make - name: make tests run: sh ./.github/run_test.sh ${{ matrix.config }} env: |