devs/libstrophe-gh
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

also run CI tests with OpenSSL 3.0

Browse Source 
... and extend build matrix of libressl.

Most of those new libressl build jobs are marked as `continue: true` since
either they don't build or they cause memory leaks (3.5/OPENBSD_7_1)
The `OPENBSD_X_Y` branches are also marked like that since they will
evolve and maybe break at a later point in time. Currently they represent
the buildable versions of their respective releases (3.3.6 resp. 3.4.3).

Also change CI distro to ubuntu-22.04 as using OpenSSL 3 on 20.04 fails.

Signed-off-by: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
This commit is contained in:
Steffen Jaeckel
2022-05-16 14:47:04 +02:00
parent 357edbd367
commit 957725348e
2 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
.github/workflows/main.yml vendored
View File

@@ -42,34 +42,43 @@ jobs:
run: | run: |
cat test-suite*.log || true cat test-suite*.log || true
libressl-tests: xssl-tests:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
strategy: strategy:
matrix: matrix:
libressl_versions: xssl_versions:
- { version: "v3.4.2", continue: true } - { version: "master", continue: true, libressl: true }
- { version: "v3.1.5", continue: false } - { version: "OPENBSD_7_1", continue: true, libressl: true }
- { version: "v2.1.10", continue: false } - { version: "v3.5.2", continue: true, libressl: true }
- { version: "OPENBSD_7_0", continue: true, libressl: true }
- { version: "v3.4.3", continue: true, libressl: true }
- { version: "v3.4.2", continue: true, libressl: true }
- { version: "OPENBSD_6_9", continue: true, libressl: true }
- { version: "v3.1.5", continue: true, libressl: true }
- { version: "v2.1.10", continue: true, libressl: true }
- { version: "openssl-3.0", continue: true, libressl: false }
- { version: "openssl-3.0.4", continue: false, libressl: false }
valgrind: valgrind:
- { configure: '' , make: 'check' } - { configure: '' , make: 'check' }
- { configure: '--enable-valgrind' , make: 'check-valgrind' } - { configure: '--enable-valgrind' , make: 'check-valgrind' }
name: LibreSSL tests name: xSSL tests
continue-on-error: ${{ matrix.libressl_versions.continue }} continue-on-error: ${{ matrix.xssl_versions.continue }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: install dependencies - name: install dependencies
run: | run: |
sudo apt update sudo apt update
sudo apt install -y libtool pkg-config libexpat1-dev valgrind sudo apt install -y libtool pkg-config libexpat1-dev valgrind
- name: build&install libressl - name: build&install the TLS stack
env: env:
LIBRESSL_COMMIT: ${{ matrix.libressl_versions.version }} XSSL_COMMITISH: ${{ matrix.xssl_versions.version }}
LIBRESSL: ${{ matrix.xssl_versions.libressl }}
run: | run: |
./travis/before_script.sh ./travis/before_script.sh
- name: Build the library - name: Build the library
run: | run: |
./bootstrap.sh ./bootstrap.sh
./configure ${{ matrix.valgrind.configure }} PKG_CONFIG_PATH="${HOME}/libressl/lib/pkgconfig" CFLAGS="-Werror -g3" --prefix="${HOME}/libressl" ./configure ${{ matrix.valgrind.configure }} PKG_CONFIG_PATH="${HOME}/xssl/lib/pkgconfig" CFLAGS="-Werror -g3" --prefix="${HOME}/xssl"
make -j$(nproc) make -j$(nproc)
- name: Run tests - name: Run tests
run: | run: |

34
travis/before_script.sh
View File

@@ -1,14 +1,26 @@
#!/bin/sh #!/bin/sh
if [ "x$LIBRESSL_COMMIT" != "x" ]; then set -e
cd "$HOME"
git clone https://github.com/libressl-portable/portable.git libressl-git [ "x$XSSL_COMMITISH" != "x" ]
cd libressl-git
if [ -n "$LIBRESSL_COMMIT" ]; then if [ "x$LIBRESSL" = "xtrue" ]; then
git checkout "$LIBRESSL_COMMIT" REPO_URL="https://github.com/libressl-portable/portable.git"
fi AUTOGEN_CMD="./autogen.sh"
./autogen.sh CONFIG_CMD="./configure --prefix=$HOME/xssl"
./configure --prefix="$HOME/libressl" MAKE_TARGET="install"
make -j"$(nproc)" else
make install REPO_URL="https://github.com/openssl/openssl.git"
AUTOGEN_CMD="true"
CONFIG_CMD="./Configure --prefix=$HOME/xssl --libdir=lib"
MAKE_TARGET="install_sw"
fi fi
cd "$HOME"
git clone --no-checkout "$REPO_URL" xssl-git
cd xssl-git
git checkout "$XSSL_COMMITISH"
$AUTOGEN_CMD
$CONFIG_CMD
make -j"$(nproc)"
make $MAKE_TARGET