]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Don't use make -j2.
authorDarren Tucker <dtucker@dtucker.net>
Thu, 12 Oct 2023 11:01:23 +0000 (22:01 +1100)
committerDarren Tucker <dtucker@dtucker.net>
Thu, 12 Oct 2023 11:01:23 +0000 (22:01 +1100)
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.

.github/setup_ci.sh
.github/workflows/c-cpp.yml

index 010a333a66424327f88288ac4ab8930bbc573f3c..9e6d6d622dfd78ecb8c6e4423aca2b5998ca63df 100755 (executable)
@@ -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
 
index be0c97f84cfd844b43b038aa5b63d910bb7a9a6b..ca6a0a54f1d08aa75e6521fccecefdf189fef2bb 100644 (file)
@@ -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: