CI/GHA: merge event-based and NSS into new linux workflow

Continue work on merging all Linux workflows into one file.

Follow up to #9501
Closes #9506

diff --git a/.github/workflows/event-based.yml b/.github/workflows/event-based.yml
deleted file mode 100644 (file)
index e4f83bc..0000000
--- a/.github/workflows/event-based.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (C) 2000 - 2022 Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# SPDX-License-Identifier: curl
-
-name: Linux
-
-on:
-  # Trigger the workflow on push or pull requests, but only for the
-  # master branch
-  push:
-    branches:
-    - master
-    - '*/ci'
-  pull_request:
-    branches:
-    - master
-
-jobs:
-  autotools:
-    name: ${{ matrix.build.name }}
-    runs-on: 'ubuntu-latest'
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      matrix:
-        build:
-        - name: event-based
-          install: libpsl-dev libbrotli-dev libzstd-dev libssh-dev
-          configure: --enable-debug --disable-shared --disable-threaded-resolver --with-libssh --with-openssl
-          tflags: -n -e '!TLS-SRP'
-
-    steps:
-    - run: |
-        sudo apt-get update
-        sudo apt-get install libtool autoconf automake pkg-config stunnel4 ${{ matrix.build.install }}
-        sudo python3 -m pip install impacket
-      name: 'install prereqs and impacket'
-
-    - uses: actions/checkout@v3
-
-    - run: autoreconf -fi
-      name: 'autoreconf'
-
-    - run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }}
-      name: 'configure'
-
-    - run: make V=1
-      name: 'make'
-
-    - run: make V=1 examples
-      name: 'make examples'
-
-    - run: make V=1 test-ci
-      name: 'test'
-      env:
-        TFLAGS: "${{ matrix.build.tflags }}"

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 84dbc5e28b78906eaf18821fbdaf6f2fe61fd8d5..237ccb13a7c3205e6432535557df4df1471da769 100644 (file)
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -34,10 +34,19 @@ jobs:
           install_steps: bearssl
           configure: CC=clang LDFLAGS="-Wl,-rpath,$HOME/bear/lib" --with-bearssl=$HOME/bear --enable-debug
 
+        - name: event-based
+          install_packages: libpsl-dev libbrotli-dev libzstd-dev libssh-dev
+          configure: --enable-debug --disable-shared --disable-threaded-resolver --with-libssh --with-openssl
+          tflags: -n -e '!TLS-SRP'
+
         - name: hyper
           install_steps: rust hyper
           configure: LDFLAGS="-Wl,-rpath,$HOME/hyper/target/debug" --with-openssl --with-hyper=$HOME/hyper --enable-debug --enable-websockets
 
+        - name: NSS
+          install_packages: clang-9 libnss3-dev libpsl-dev libbrotli-dev libzstd-dev libnghttp2-dev nss-plugin-pem
+          configure: CC=clang-9 CPPFLAGS="-isystem /usr/include/nss" --with-nss --enable-debug --with-nss-deprecated
+
     steps:
     - run: |
         sudo apt-get update

diff --git a/.github/workflows/nss.yml b/.github/workflows/nss.yml
deleted file mode 100644 (file)
index 92d0007..0000000
--- a/.github/workflows/nss.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright (C) 2000 - 2022 Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# SPDX-License-Identifier: curl
-
-name: Linux
-
-on:
-  # Trigger the workflow on push or pull requests, but only for the
-  # master branch
-  push:
-    branches:
-    - master
-    - '*/ci'
-  pull_request:
-    branches:
-    - master
-
-jobs:
-  autotools:
-    name: ${{ matrix.build.name }}
-    runs-on: 'ubuntu-latest'
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      matrix:
-        build:
-        - name: NSS
-          install: clang-9 libnss3-dev libpsl-dev libbrotli-dev libzstd-dev libnghttp2-dev nss-plugin-pem
-          configure: CC=clang-9 CPPFLAGS="-isystem /usr/include/nss" --with-nss --enable-debug --with-nss-deprecated
-
-    steps:
-    - run: |
-        sudo apt-get update
-        sudo apt-get install libtool autoconf automake pkg-config stunnel4 ${{ matrix.build.install }}
-        sudo python3 -m pip install impacket
-      name: 'install prereqs and impacket'
-
-    - uses: actions/checkout@v3
-
-    - run: autoreconf -fi
-      name: 'autoreconf'
-
-    - run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }}
-      name: 'configure with clang'
-
-    - run: make V=1
-      name: 'make'
-
-    - run: make V=1 examples
-      name: 'make examples'
-
-    - run: make V=1 test-ci
-      name: 'test'
-      env:
-        TFLAGS: "${{ matrix.build.tflags }}"