From: Daniel Stenberg Date: Sat, 13 Aug 2022 21:53:56 +0000 (+0200) Subject: GHA: move libressl CI from zuul to GitHub X-Git-Tag: curl-7_85_0~65 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c7febe520ba85ad221e5b514cb9b4d38e0028231;p=thirdparty%2Fcurl.git GHA: move libressl CI from zuul to GitHub Closes #9309 --- diff --git a/.github/workflows/libressl.yml b/.github/workflows/libressl.yml new file mode 100644 index 0000000000..590f4fc8b2 --- /dev/null +++ b/.github/workflows/libressl.yml @@ -0,0 +1,67 @@ +# Copyright (C) 2000 - 2022 Daniel Stenberg, , 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: libressl + install: libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev + configure: LDFLAGS="-Wl,-rpath,$HOME/libressl/lib" --with-openssl=$HOME/libressl --enable-debug + - name: libressl-clang + install: libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev clang + configure: CC=clang LDFLAGS="-Wl,-rpath,$HOME/libressl/lib" --with-openssl=$HOME/libressl --enable-debug + + 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' + + - run: | + git clone --depth=1 -b v3.5.3 https://github.com/libressl-portable/portable.git libressl-git + cd libressl-git + ./autogen.sh + ./configure --prefix=$HOME/libressl + make + make install + name: 'build and install libressl' + + - 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/scripts/zuul/before_script.sh b/scripts/zuul/before_script.sh index a40bf6ecf3..f75846014e 100755 --- a/scripts/zuul/before_script.sh +++ b/scripts/zuul/before_script.sh @@ -94,16 +94,6 @@ if [ "$TRAVIS_OS_NAME" = linux -a "$BORINGSSL" ]; then export LIBS=-lpthread 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 - cd libressl-git - ./autogen.sh - ./configure --prefix=$HOME/libressl - make - make install -fi - if [ "$TRAVIS_OS_NAME" = linux -a "$QUICHE" ]; then cd $HOME git clone --depth=1 --recursive https://github.com/cloudflare/quiche.git diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 6947aaea3f..cb2f29eb4c 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -87,19 +87,6 @@ --with-quiche={{ ansible_user_dir }}/quiche/target/release LD_LIBRARY_PATH: "{{ ansible_user_dir }}/quiche/target/release:/usr/local/lib" -- job: - name: curl-novalgrind-libressl - parent: curl-base - vars: - curl_env: - CC: gcc-8 - CXX: g++-8 - T: novalgrind - LIBRESSL: "yes" - C: >- - --with-openssl={{ ansible_user_dir }}/libressl - LD_LIBRARY_PATH: "{{ ansible_user_dir }}/libressl/lib:/usr/local/lib" - - job: name: curl-novalgrind-ngtcp2-with-openssl parent: curl-base @@ -316,7 +303,6 @@ - curl-normal-with-openssl-gssapi-libssh2-checksrc - curl-novalgrind-boringssl-with-openssl - curl-novalgrind-boringssl-with-openssl-quiche - - curl-novalgrind-libressl - curl-novalgrind-ngtcp2-with-openssl - curl-novalgrind-ngtcp2-gnutls - curl-debug-clang-disable-alt-svc-with-openssl