From 2ca0530a4d4bd1e1ccb9c876e954d8dc9a87da4a Mon Sep 17 00:00:00 2001
From: Philip Heiduck <pheiduck@Philips-MBP.lan>
Date: Mon, 12 Sep 2022 00:04:32 +0200
Subject: [PATCH] CI: skip make, do make install at once for dependencies

Signed-off-by: Philip Heiduck <pheiduck@Philips-MBP.lan>

Closes #9477
---
 .circleci/config.yml                 | 4 ++--
 .github/workflows/libressl.yml       | 3 +--
 .github/workflows/msh3.yml           | 1 -
 .github/workflows/ngtcp2-gnutls.yml  | 8 ++++----
 .github/workflows/ngtcp2-wolfssl.yml | 6 +++---
 .github/workflows/openssl3.yml       | 2 +-
 .github/workflows/wolfssl.yml        | 2 +-
 7 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ac10f1f39c..7782ceacf7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -83,7 +83,7 @@ commands:
             cd wolfssl-5.1.1-stable
             ./autogen.sh
             ./configure --enable-tls13 --enable-all --enable-harden --prefix=$HOME/wssl
-            make && make install
+            make install
 
   install-wolfssh:
     steps:
@@ -94,7 +94,7 @@ commands:
             cd wolfssh-1.4.8-stable
             ./autogen.sh
             ./configure --with-wolfssl=$HOME/wssl --prefix=$HOME/wssh --enable-scp --enable-sftp --disable-examples
-            make && make install
+            make install
 
   configure-cares:
     steps:
diff --git a/.github/workflows/libressl.yml b/.github/workflows/libressl.yml
index 590f4fc8b2..d5c68e5c54 100644
--- a/.github/workflows/libressl.yml
+++ b/.github/workflows/libressl.yml
@@ -43,9 +43,8 @@ jobs:
         cd libressl-git
         ./autogen.sh
         ./configure --prefix=$HOME/libressl
-        make
         make install
-      name: 'build and install libressl'
+      name: 'install libressl'
 
     - uses: actions/checkout@v3
 
diff --git a/.github/workflows/msh3.yml b/.github/workflows/msh3.yml
index b326478e9b..6a061c701f 100644
--- a/.github/workflows/msh3.yml
+++ b/.github/workflows/msh3.yml
@@ -39,7 +39,6 @@ jobs:
         git clone --depth 1 -b OpenSSL_1_1_1j+quic https://github.com/quictls/openssl ossl
         cd ossl
         ./config enable-tls1_3 --prefix=$HOME/quictls
-        make
         make install_sw
       name: 'install quictls'
 
diff --git a/.github/workflows/ngtcp2-gnutls.yml b/.github/workflows/ngtcp2-gnutls.yml
index 0fd7b838c6..fcd209f4b8 100644
--- a/.github/workflows/ngtcp2-gnutls.yml
+++ b/.github/workflows/ngtcp2-gnutls.yml
@@ -41,7 +41,7 @@ jobs:
         cd nettle
         ./.bootstrap
         ./configure LDFLAGS="-Wl,-rpath,$HOME/all/lib" ${{ matrix.build.nettle-configure }} --prefix=$HOME/all --libdir=$HOME/all/lib --disable-documentation
-        make && make install
+        make install
       name: 'install nettle'
 
     - run: |
@@ -49,7 +49,7 @@ jobs:
         cd gnutls
         ./bootstrap
         ./configure PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" LDFLAGS="-Wl,-rpath,$HOME/all/lib -L$HOME/all/lib" --prefix=$HOME/all ${{ matrix.build.gnutls-configure }} --disable-tools
-        make V=1 && make install
+        make install
       name: 'install gnutls'
 
     - run: |
@@ -57,7 +57,7 @@ jobs:
         cd nghttp3
         autoreconf -fi
         ./configure --prefix=$HOME/all --enable-lib-only
-        make && make install
+        make install
       name: 'install nghttp3'
 
     - run: |
@@ -65,7 +65,7 @@ jobs:
         cd ngtcp2
         autoreconf -fi
         ./configure PKG_CONFIG_PATH=$HOME/all/lib/pkgconfig LDFLAGS="-Wl,-rpath,$HOME/all/lib" --prefix=$HOME/all --enable-lib-only --with-gnutls=$HOME/all
-        make && make install
+        make install
       name: 'install ngtcp2'
 
     - uses: actions/checkout@v3
diff --git a/.github/workflows/ngtcp2-wolfssl.yml b/.github/workflows/ngtcp2-wolfssl.yml
index f55aafc7f5..1c25283bba 100644
--- a/.github/workflows/ngtcp2-wolfssl.yml
+++ b/.github/workflows/ngtcp2-wolfssl.yml
@@ -41,7 +41,7 @@ jobs:
         cd wolfssl
         ./autogen.sh
         ./configure ${{ matrix.build.wolfssl-configure }} --prefix=$HOME/all
-        make && make install
+        make install
       name: 'install wolfssl'
 
     - run: |
@@ -49,7 +49,7 @@ jobs:
         cd nghttp3
         autoreconf -fi
         ./configure --prefix=$HOME/all --enable-lib-only
-        make && make install
+        make install
       name: 'install nghttp3'
 
     - run: |
@@ -57,7 +57,7 @@ jobs:
         cd ngtcp2
         autoreconf -fi
         ./configure PKG_CONFIG_PATH=$HOME/all/lib/pkgconfig LDFLAGS="-Wl,-rpath,$HOME/all/lib" --prefix=$HOME/all --enable-lib-only --with-wolfssl=$HOME/all
-        make && make install
+        make install
       name: 'install ngtcp2'
 
     - uses: actions/checkout@v3
diff --git a/.github/workflows/openssl3.yml b/.github/workflows/openssl3.yml
index 55adf4876b..7838104074 100644
--- a/.github/workflows/openssl3.yml
+++ b/.github/workflows/openssl3.yml
@@ -46,7 +46,7 @@ jobs:
         git clone --depth=1 https://github.com/openssl/openssl
         cd openssl
         ./config enable-tls1_3 --prefix=$HOME/openssl3
-        make && make install_sw
+        make install_sw
       name: 'install openssl3'
 
     - uses: actions/checkout@v3
diff --git a/.github/workflows/wolfssl.yml b/.github/workflows/wolfssl.yml
index a92f2d3bd7..aa08a79018 100644
--- a/.github/workflows/wolfssl.yml
+++ b/.github/workflows/wolfssl.yml
@@ -46,7 +46,7 @@ jobs:
         cd wolfssl-5.0.0-stable
         ./autogen.sh
         ./configure --enable-tls13 ${{ matrix.build.wolfssl-configure }} --enable-harden --prefix=$HOME/wssl
-        make && make install
+        make install
       name: 'install wolfssl'
 
     - uses: actions/checkout@v3
-- 
2.47.3