From: Marc Hoersken <info@marc-hoersken.de>
Date: Thu, 1 Sep 2022 20:44:43 +0000 (+0200)
Subject: GHA: prepare workflow merge by aligning structure again
X-Git-Tag: curl-7_86_0~267
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0af3edfef8d17e18e771a71b3d07714b486bcd20;p=thirdparty%2Fcurl.git

GHA: prepare workflow merge by aligning structure again

Closes #9413
---

diff --git a/.github/workflows/ngtcp2-gnutls.yml b/.github/workflows/ngtcp2-gnutls.yml
index a65fb28559..0fd7b838c6 100644
--- a/.github/workflows/ngtcp2-gnutls.yml
+++ b/.github/workflows/ngtcp2-gnutls.yml
@@ -25,14 +25,14 @@ jobs:
       matrix:
         build:
         - name: gnutls
-          install:
+          install: nettle-dev libp11-kit-dev libtspi-dev libunistring-dev guile-2.2-dev libtasn1-bin libtasn1-6-dev libidn2-0-dev gawk gperf libtss2-dev dns-root-data bison gtk-doc-tools texinfo texlive texlive-extra-utils autopoint libev-dev
           configure: LDFLAGS="-Wl,-rpath,$HOME/all/lib" --with-gnutls=$HOME/all --enable-debug
           gnutls-configure: --with-included-libtasn1 --with-included-unistring --disable-guile --disable-doc --disable-tests
 
     steps:
     - run: |
         sudo apt-get update
-        sudo apt-get install libtool autoconf automake pkg-config stunnel4 ${{ matrix.build.install }} python3 nettle-dev libp11-kit-dev libtspi-dev libunistring-dev guile-2.2-dev libtasn1-bin libtasn1-6-dev libidn2-0-dev gawk gperf libtss2-dev dns-root-data bison gtk-doc-tools texinfo texlive texlive-extra-utils autopoint libev-dev
+        sudo apt-get install libtool autoconf automake pkg-config stunnel4 ${{ matrix.build.install }}
         sudo python3 -m pip install impacket
       name: 'install prereqs and impacket'
 
diff --git a/.github/workflows/torture.yml b/.github/workflows/torture.yml
index 744c7c9eca..c73a4aee5c 100644
--- a/.github/workflows/torture.yml
+++ b/.github/workflows/torture.yml
@@ -25,18 +25,18 @@ jobs:
       matrix:
         build:
         - name: torture
-          install:
-          configure:
+          install: libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libnghttp2-dev libssh2-1-dev libc-ares-dev
+          configure: --with-openssl --enable-debug --enable-ares
           tflags: -n -t --shallow=25 !FTP
         - name: torture-ftp
-          install:
-          configure:
+          install: libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libnghttp2-dev libssh2-1-dev libc-ares-dev
+          configure: --with-openssl --enable-debug --enable-ares
           tflags: -n -t --shallow=20 FTP
 
     steps:
     - run: |
         sudo apt-get update
-        sudo apt-get install libtool autoconf automake pkg-config stunnel4 libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libnghttp2-dev libssh2-1-dev libc-ares-dev ${{ matrix.build.install }}
+        sudo apt-get install libtool autoconf automake pkg-config stunnel4 ${{ matrix.build.install }}
         sudo python3 -m pip install impacket
       name: 'install prereqs and impacket'
 
@@ -45,7 +45,7 @@ jobs:
     - run: autoreconf -fi
       name: 'autoreconf'
 
-    - run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }} --with-openssl --enable-debug --enable-ares
+    - run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }}
       name: 'configure'
 
     - run: make V=1