From 70a1101e419e07eb031be2799582f5550fcc4940 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Sun, 9 Jan 2022 12:28:00 +0100
Subject: CI: move the rustls CI job to GHA from Zuul

Closes #8251
---
 .github/workflows/rustls.yml  | 49 +++++++++++++++++++++++++++++++++++++++++++
 scripts/zuul/before_script.sh | 11 ----------
 scripts/zuul/script.sh        |  8 +------
 zuul.d/jobs.yaml              | 17 ---------------
 4 files changed, 50 insertions(+), 35 deletions(-)
 create mode 100644 .github/workflows/rustls.yml

diff --git a/.github/workflows/rustls.yml b/.github/workflows/rustls.yml
new file mode 100644
index 000000000..19cc7ec65
--- /dev/null
+++ b/.github/workflows/rustls.yml
@@ -0,0 +1,49 @@
+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: rustls
+          install:
+          configure: --with-rustls=$HOME/rustls --enable-debug --enable-werror
+
+    steps:
+    - run: sudo apt-get install libtool autoconf automake pkg-config libpsl-dev libbrotli-dev libzstd-dev stunnel4
+      name: install prereqs
+
+    - run: |
+       git clone --depth=1 --recursive https://github.com/rustls/rustls-ffi.git -b v0.8.2
+       curl https://sh.rustup.rs -sSf | sh -s -- -y
+       source $HOME/.cargo/env
+       cd rustls-ffi
+       make
+       make DESTDIR=$HOME/rustls install
+
+      name: 'install rustls'
+
+    - uses: actions/checkout@v2
+
+    - run: ./buildconf && ./configure --enable-warnings --enable-werror ${{ 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 1c19f820b..a4179740c 100755
--- a/scripts/zuul/before_script.sh
+++ b/scripts/zuul/before_script.sh
@@ -122,17 +122,6 @@ if [ "$TRAVIS_OS_NAME" = linux -a "$QUICHE" ]; then
   ln -vnf $(find target/release -name libcrypto.a -o -name libssl.a) quiche/deps/boringssl/src/lib/
 fi
 
-if [ "$TRAVIS_OS_NAME" = linux -a "$RUSTLS_VERSION" ]; then
-  cd $HOME
-  git clone --depth=1 --recursive https://github.com/rustls/rustls-ffi.git -b "$RUSTLS_VERSION"
-  curl https://sh.rustup.rs -sSf | sh -s -- -y
-  source $HOME/.cargo/env
-  cargo install cbindgen
-  cd $HOME/rustls-ffi
-  make
-  make DESTDIR=$HOME/rustls install
-fi
-
 # Install common libraries.
 if [ $TRAVIS_OS_NAME = linux ]; then
 
diff --git a/scripts/zuul/script.sh b/scripts/zuul/script.sh
index 557b1a3fa..7075e1aa7 100755
--- a/scripts/zuul/script.sh
+++ b/scripts/zuul/script.sh
@@ -6,7 +6,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
@@ -64,12 +64,6 @@ if [ "$T" = "debug-mesalink" ]; then
   make "TFLAGS=-n !313 !410 !3001" test-nonflaky
 fi
 
-if [ "$T" = "debug-rustls" ]; then
-  ./configure --enable-debug --enable-werror $C
-  make
-  make "TFLAGS=HTTPS !313" test-nonflaky
-fi
-
 if [ "$T" = "debug-bearssl" ]; then
   ./configure --enable-debug --enable-werror $C
   make
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index e13bdc4e1..6d23d806d 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -126,22 +126,6 @@
           --with-quiche={{ ansible_user_dir }}/quiche/target/release
         LD_LIBRARY_PATH: "{{ ansible_user_dir }}/quiche/target/release:/usr/local/lib"
 
-- job:
-    name: curl-debug-rustls
-    parent: curl-base
-    vars:
-      curl_apt_packages:
-        - libpsl-dev
-        - libbrotli-dev
-        - libzstd-dev
-      curl_env:
-        T: debug-rustls
-        # Keep this in sync with the version in docs/RUSTLS.md
-        RUSTLS_VERSION: v0.8.2
-        LIBS: -lm
-        C: >-
-          --with-rustls={{ ansible_user_dir }}/rustls
-
 - job:
     name: curl-debug-bearssl
     parent: curl-base
@@ -513,7 +497,6 @@
       - curl-normal-with-openssl-disable-verbose-notests
       - curl-novalgrind-boringssl-with-openssl
       - curl-novalgrind-boringssl-with-openssl-quiche
-      - curl-debug-rustls
       - curl-debug-bearssl
       - curl-novalgrind-libressl
       - curl-novalgrind-ngtcp2-with-openssl
-- 
cgit v1.2.1