CI: move the NSS job from zuul to GHA

Closes #8396

diff --git a/.github/workflows/nss.yml b/.github/workflows/nss.yml
new file mode 100644 (file)
index 0000000..7e9212b
--- /dev/null
+++ b/.github/workflows/nss.yml
@@ -0,0 +1,50 @@
+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:
+          configure: --with-nss --enable-debug --enable-werror
+
+    steps:
+    - run: |
+        sudo apt-get install libtool autoconf automake pkg-config stunnel4 python3-pip libnss3-dev clang-9 libpsl-dev libbrotli-dev libzstd-dev libnghttp2-dev nss-plugin-pem
+        sudo pip3 install impacket
+      name: install prereqs and impacket
+
+    - uses: actions/checkout@v2
+
+    - run: ./buildconf
+      name: 'buildconf'
+
+    - run: CC=clang-9 CPPFLAGS="-isystem /usr/include/nss" ./configure ${{ 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 }}"

diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc
index 3354f454d42dfd9861ff3ffda66b39036d3df268..7e7844e9e0f6e53c974bae8c8b0957fbbc1c1c1d 100644 (file)
--- a/tests/unit/Makefile.inc
+++ b/tests/unit/Makefile.inc
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -135,7 +135,7 @@ unit1620_CPPFLAGS = $(AM_CPPFLAGS)
 
 unit1621_SOURCES = unit1621.c $(UNITFILES)
 unit1621_CPPFLAGS = $(AM_CPPFLAGS)
-unit1621_LDADD = $(top_builddir)/src/libcurltool.la $(top_builddir)/lib/libcurl.la
+unit1621_LDADD = $(top_builddir)/src/libcurltool.la $(top_builddir)/lib/libcurl.la @NSS_LIBS@
 
 unit1650_SOURCES = unit1650.c $(UNITFILES)
 unit1650_CPPFLAGS = $(AM_CPPFLAGS)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 2de71af7e3e764869b05267f027cab23a3bda284..4e8b1148bf96b1ed4ea5aa1044668ba1fc0b41d3 100644 (file)
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -230,25 +230,6 @@
         C: >-
           --with-gnutls
 
-- job:
-    name: curl-debug-clang-with-nss
-    parent: curl-base
-    vars:
-      curl_apt_packages:
-        - clang-9
-        - libpsl-dev
-        - libbrotli-dev
-        - libzstd-dev
-        - libnss3-dev
-      curl_env:
-        CC: clang-9
-        CXX: clang++-9
-        T: debug
-        C: >-
-          --with-nss
-        CPPFLAGS: -isystem /usr/include/nss
-        NOTESTS: 1
-
 - job:
     name: curl-cmake-boringssl-quiche
     parent: curl-base
@@ -401,7 +382,6 @@
       - curl-debug-clang-with-openssl
       - curl-debug-clang-disable-alt-svc-with-openssl
       - curl-debug-clang-with-gnutls
-      - curl-debug-clang-with-nss
       - curl-cmake-boringssl-quiche
       - curl-cmake-ngtcp2
       - curl-torture