CI/GHA: merge intel CC and more TLS libs into linux workflow

Continue work on merging all Linux workflows into one file.

Reviewed-by: Max Dymond
Follow up to #9501
Closes #9514
This commit is contained in:
Marc Hoersken 2022-09-15 21:20:10 +02:00
parent 7ca36f4956
commit db02e0e980
No known key found for this signature in database
GPG Key ID: 61E03CBED7BC859E
5 changed files with 68 additions and 262 deletions

View File

@ -1,69 +0,0 @@
# Copyright (C) 2000 - 2022 Daniel Stenberg, <daniel@haxx.se>, 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: Intel compiler - without SSL
install: libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev
configure: CC=icc --enable-debug --without-ssl
- name: Intel compiler - OpenSSL
install: libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libssl-dev
configure: CC=icc --enable-debug --with-openssl
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: |
cd /tmp
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
sudo apt install --no-install-recommends intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic
source /opt/intel/oneapi/setvars.sh
printenv >> $GITHUB_ENV
name: 'Install Intel compilers'
- 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 }}"

View File

@ -1,66 +0,0 @@
# Copyright (C) 2000 - 2022 Daniel Stenberg, <daniel@haxx.se>, 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 install
name: '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 }}"

View File

@ -34,6 +34,26 @@ jobs:
install_steps: bearssl
configure: CC=clang LDFLAGS="-Wl,-rpath,$HOME/bear/lib" --with-bearssl=$HOME/bear --enable-debug
- name: libressl
install_packages: libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev
install_steps: libressl
configure: LDFLAGS="-Wl,-rpath,$HOME/libressl/lib" --with-openssl=$HOME/libressl --enable-debug
- name: libressl-clang
install_packages: libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev clang
install_steps: libressl
configure: CC=clang LDFLAGS="-Wl,-rpath,$HOME/libressl/lib" --with-openssl=$HOME/libressl --enable-debug
- name: mbedtls
install_packages: libpsl-dev libbrotli-dev libzstd-dev libnghttp2-dev
install_steps: mbedtls
configure: LDFLAGS="-Wl,-rpath,$HOME/mbed/lib" --with-mbedtls=$HOME/mbed --enable-debug
- name: mbedtls-clang
install_packages: libpsl-dev libbrotli-dev libzstd-dev libnghttp2-dev clang
install_steps: mbedtls
configure: CC=clang LDFLAGS="-Wl,-rpath,$HOME/mbed/lib" --with-mbedtls=$HOME/mbed --enable-debug
- name: event-based
install_packages: libpsl-dev libbrotli-dev libzstd-dev libssh-dev
configure: --enable-debug --disable-shared --disable-threaded-resolver --with-libssh --with-openssl
@ -43,6 +63,21 @@ jobs:
install_steps: rust hyper
configure: LDFLAGS="-Wl,-rpath,$HOME/hyper/target/debug" --with-openssl --with-hyper=$HOME/hyper --enable-debug --enable-websockets
- name: rustls
install_packages: libpsl-dev libbrotli-dev libzstd-dev
install_steps: rust rustls
configure: --with-rustls=$HOME/rustls --enable-debug
- name: Intel compiler - without SSL
install_packages: libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev
install_steps: intel
configure: CC=icc --enable-debug --without-ssl
- name: Intel compiler - OpenSSL
install_packages: libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libssl-dev
install_steps: intel
configure: CC=icc --enable-debug --with-openssl
- name: NSS
install_packages: clang-9 libnss3-dev libpsl-dev libbrotli-dev libzstd-dev libnghttp2-dev nss-plugin-pem
configure: CC=clang-9 CPPFLAGS="-isystem /usr/include/nss" --with-nss --enable-debug --with-nss-deprecated
@ -65,6 +100,22 @@ jobs:
cp build/libbearssl.* $HOME/bear/lib
name: 'install bearssl'
- if: ${{ contains(matrix.build.install_steps, 'libressl') }}
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 install
name: 'install libressl'
- if: ${{ contains(matrix.build.install_steps, 'mbedtls') }}
run: |
git clone --depth=1 -b v3.1.0 https://github.com/ARMmbed/mbedtls
cd mbedtls
make DESTDIR=$HOME/mbed install
name: 'install mbedtls'
- if: ${{ contains(matrix.build.install_steps, 'rust') }}
run: |
cd $HOME
@ -73,6 +124,13 @@ jobs:
rustup toolchain install nightly
name: 'install rust'
- if: ${{ contains(matrix.build.install_steps, 'rustls') }}
run: |
git clone --depth=1 -b v0.8.2 --recursive https://github.com/rustls/rustls-ffi.git
cd rustls-ffi
make DESTDIR=$HOME/rustls install
name: 'install rustls'
- if: ${{ contains(matrix.build.install_steps, 'hyper') }}
run: |
cd $HOME
@ -82,6 +140,16 @@ jobs:
echo "LD_LIBRARY_PATH=$HOME/hyper/target/debug:/usr/local/lib" >> $GITHUB_ENV
name: 'install hyper'
- if: ${{ contains(matrix.build.install_steps, 'intel') }}
run: |
cd /tmp
curl https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | sudo apt-key add -
sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
sudo apt install --no-install-recommends intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic
source /opt/intel/oneapi/setvars.sh
printenv >> $GITHUB_ENV
name: 'install Intel compilers'
- uses: actions/checkout@v3
- run: autoreconf -fi

View File

@ -1,64 +0,0 @@
# Copyright (C) 2000 - 2022 Daniel Stenberg, <daniel@haxx.se>, 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: mbedtls
install: libpsl-dev libbrotli-dev libzstd-dev libnghttp2-dev
configure: LDFLAGS="-Wl,-rpath,$HOME/mbed/lib" --with-mbedtls=$HOME/mbed --enable-debug
- name: mbedtls-clang
install: libpsl-dev libbrotli-dev libzstd-dev libnghttp2-dev clang
configure: CC=clang LDFLAGS="-Wl,-rpath,$HOME/mbed/lib" --with-mbedtls=$HOME/mbed --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.1.0 https://github.com/ARMmbed/mbedtls
cd mbedtls
make DESTDIR=$HOME/mbed install
name: 'install mbedtls'
- 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 }}"

View File

@ -1,63 +0,0 @@
# Copyright (C) 2000 - 2022 Daniel Stenberg, <daniel@haxx.se>, 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: rustls
install: libpsl-dev libbrotli-dev libzstd-dev
configure: --with-rustls=$HOME/rustls --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 --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 DESTDIR=$HOME/rustls install
name: 'install rustls'
- 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 }}"