From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 7 Apr 2022 06:35:08 +0000 (+0200)
Subject: GHA: add openssl3 jobs moved over from zuul
X-Git-Tag: curl-7_83_0~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51d271213bf75548160b91e8bcc05031a50edf75;p=thirdparty%2Fcurl.git

GHA: add openssl3 jobs moved over from zuul

Closes #8683
---

diff --git a/.github/workflows/openssl3.yml b/.github/workflows/openssl3.yml
new file mode 100644
index 0000000000..d4601f6a41
--- /dev/null
+++ b/.github/workflows/openssl3.yml
@@ -0,0 +1,51 @@
+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: openssl3
+          install:
+          configure: --with-openssl=$HOME/openssl3 --enable-debug --enable-werror
+        - name: clang-openssl3
+          install:
+          configure: CC=clang --with-openssl=$HOME/openssl3 --enable-debug --enable-werror
+
+    steps:
+    - run: |
+        sudo apt-get install libtool autoconf automake pkg-config clang stunnel4 libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev
+        sudo python3 -m pip install impacket
+      name: install prereqs and impacket
+
+    - run: |
+        git clone --depth=1 https://github.com/openssl/openssl
+        cd openssl
+        ./config enable-tls1_3 --prefix=$HOME/openssl3
+        make && make install_sw
+      name: 'build and install openssl3'
+
+    - uses: actions/checkout@v2
+
+    - run: autoreconf -fi && LDFLAGS="-Wl,-rpath,$HOME/openssl3/lib64" ./configure --enable-warnings --enable-werror --enable-headers-api ${{ matrix.build.configure }} && make V=1
+      name: 'configure and build'
+
+    - run: make V=1 test-ci
+      name: 'test'
+      env:
+        TFLAGS: "${{ matrix.build.tflags }}"
diff --git a/scripts/zuul/before_script.sh b/scripts/zuul/before_script.sh
index 91b8403d50..e827800d6f 100755
--- a/scripts/zuul/before_script.sh
+++ b/scripts/zuul/before_script.sh
@@ -87,15 +87,6 @@ if [ "$TRAVIS_OS_NAME" = linux -a "$BORINGSSL" ]; then
   export LIBS=-lpthread
 fi
 
-if [ "$TRAVIS_OS_NAME" = linux -a "$OPENSSL3" ]; then
-  cd $HOME
-  git clone --depth=1 https://github.com/openssl/openssl
-  cd openssl
-  ./config enable-tls1_3 --prefix=$HOME/openssl3
-  make
-  make install_sw
-fi
-
 if [ "$TRAVIS_OS_NAME" = linux -a "$LIBRESSL" ]; then
   cd $HOME
   git clone --depth=1 -b v3.1.4 https://github.com/libressl-portable/portable.git libressl-git
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 9033c6cab3..94314c05c2 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -162,40 +162,6 @@
           --with-nghttp3={{ ansible_user_dir }}/ngbuild
         NOTESTS:
 
-- job:
-    name: curl-debug-openssl3
-    parent: curl-base
-    vars:
-      curl_apt_packages:
-        - libpsl-dev
-        - libbrotli-dev
-        - libzstd-dev
-      curl_env:
-        CC: gcc-8
-        CXX: g++-8
-        T: debug
-        OPENSSL3: "yes"
-        C: >-
-          --with-openssl={{ ansible_user_dir }}/openssl3
-        LD_LIBRARY_PATH: "{{ ansible_user_dir }}/openssl3/lib64:/usr/local/lib"
-        TFLAGS: https ftps
-
-- job:
-    name: curl-debug-clang-with-openssl
-    parent: curl-base
-    vars:
-      curl_apt_packages:
-        - clang-9
-        - libpsl-dev
-        - libbrotli-dev
-        - libzstd-dev
-      curl_env:
-        CC: clang-9
-        CXX: clang++-9
-        T: debug
-        C: >-
-          --with-openssl
-
 - job:
     name: curl-debug-clang-disable-alt-svc-with-openssl
     parent: curl-base
@@ -362,8 +328,6 @@
       - curl-novalgrind-libressl
       - curl-novalgrind-ngtcp2-with-openssl
       - curl-novalgrind-ngtcp2-gnutls
-      - curl-debug-openssl3
-      - curl-debug-clang-with-openssl
       - curl-debug-clang-disable-alt-svc-with-openssl
       - curl-debug-clang-with-gnutls
       - curl-cmake-boringssl-quiche