GHA: move bearssl jobs over from zuul

Closes #8684

diff --git a/.github/workflows/bearssl.yml b/.github/workflows/bearssl.yml
new file mode 100644 (file)
index 0000000..f9b8119
--- /dev/null
+++ b/.github/workflows/bearssl.yml
@@ -0,0 +1,55 @@
+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: bearssl
+          install:
+          configure: --with-bearssl=$HOME/bear --enable-debug --enable-werror
+        - name: clang-bearssl
+          install:
+          configure: CC=clang --with-bearssl=$HOME/bear --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: |
+        curl -LO https://bearssl.org/bearssl-0.6.tar.gz
+        tar -xzf bearssl-0.6.tar.gz
+        cd bearssl-0.6
+        make
+        mkdir -p $HOME/bear/lib $HOME/bear/include
+        cp inc/*.h $HOME/bear/include
+        cp build/libbearssl.* $HOME/bear/lib
+
+      name: 'get, build and install bearssl'
+
+    - uses: actions/checkout@v2
+
+    - run: autoreconf -fi && LDFLAGS="-Wl,-rpath,$HOME/bear/lib" ./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 e827800d6f623211a38287327e3d2daed8db7e01..9ca8a911d26d3aaee7d2de1e207f7ddfdc3b2904 100755 (executable)
--- a/scripts/zuul/before_script.sh
+++ b/scripts/zuul/before_script.sh
@@ -112,21 +112,3 @@ if [ "$TRAVIS_OS_NAME" = linux -a "$QUICHE" ]; then
   mkdir -v quiche/deps/boringssl/src/lib
   ln -vnf $(find target/release -name libcrypto.a -o -name libssl.a) quiche/deps/boringssl/src/lib/
 fi
-
-# Install common libraries.
-if [ $TRAVIS_OS_NAME = linux ]; then
-
-  if [ "$BEARSSL" = "yes" ]; then
-    if [ ! -e $HOME/bearssl-0.6/Makefile ]; then
-      cd $HOME
-      curl -LO https://bearssl.org/bearssl-0.6.tar.gz
-      tar -xzf bearssl-0.6.tar.gz
-      cd bearssl-0.6
-      make
-    fi
-    cd $HOME/bearssl-0.6
-    sudo cp inc/*.h /usr/local/include
-    sudo cp build/libbearssl.* /usr/local/lib
-  fi
-
-fi

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 94314c05c25ec330001dc375a4d048d4fbdeb2ee..0ae03bd46dad4cc3d328b5eaae0b8d0506c7810b 100644 (file)
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -85,20 +85,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-bearssl
-    parent: curl-base
-    vars:
-      curl_apt_packages:
-        - libpsl-dev
-        - libbrotli-dev
-        - libzstd-dev
-      curl_env:
-        T: debug-bearssl
-        BEARSSL: "yes"
-        C: >-
-          --with-bearssl
-
 - job:
     name: curl-novalgrind-libressl
     parent: curl-base
@@ -324,7 +310,6 @@
       - curl-normal-with-openssl-gssapi-libssh2-checksrc
       - curl-novalgrind-boringssl-with-openssl
       - curl-novalgrind-boringssl-with-openssl-quiche
-      - curl-debug-bearssl
       - curl-novalgrind-libressl
       - curl-novalgrind-ngtcp2-with-openssl
       - curl-novalgrind-ngtcp2-gnutls