diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2023-08-21 10:05:26 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2023-08-21 11:17:18 +0200 |
| commit | 1acac79bfbe207e8db639e8043524962037c8feb (patch) | |
| tree | b564762bd82080d383030c8e47ee8016e07c69e0 | |
| parent | upstream: want stdlib.h for free(3) (diff) | |
| download | openssh-1acac79bfbe207e8db639e8043524962037c8feb.tar.xz openssh-1acac79bfbe207e8db639e8043524962037c8feb.zip | |
Add test for zlib development branch.
Diffstat (limited to '')
| -rwxr-xr-x | .github/configs | 4 | ||||
| -rwxr-xr-x | .github/setup_ci.sh | 8 | ||||
| -rw-r--r-- | .github/workflows/c-cpp.yml | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/.github/configs b/.github/configs index e054eb319..66cb2d0e8 100755 --- a/.github/configs +++ b/.github/configs @@ -205,6 +205,10 @@ case "$config" in ;; esac ;; + zlib-develop) + INSTALL_ZLIB=develop + CONFIGFLAGS="--with-zlib=/opt/zlib --with-rpath=-Wl,-rpath," + ;; *) echo "Unknown configuration $config" exit 1 diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh index 154f51bdc..010a333a6 100755 --- a/.github/setup_ci.sh +++ b/.github/setup_ci.sh @@ -133,6 +133,8 @@ for TARGET in $TARGETS; do valgrind*) PACKAGES="$PACKAGES valgrind" ;; + zlib-*) + ;; *) echo "Invalid option '${TARGET}'" exit 1 ;; @@ -214,3 +216,9 @@ if [ ! -z "${INSTALL_BORINGSSL}" ]; then cp ${HOME}/boringssl/build/crypto/libcrypto.a /opt/boringssl/lib && cp -r ${HOME}/boringssl/include /opt/boringssl) fi + +if [ ! -z "${INSTALL_ZLIB}" ]; then + (cd ${HOME} && git clone https://github.com/madler/zlib.git && + cd ${HOME}/zlib && ./configure && make && + sudo make install prefix=/opt/zlib) +fi diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index e4e2a64e0..be0c97f84 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -73,6 +73,7 @@ jobs: - { target: ubuntu-latest, config: openssl-3.1.0 } - { target: ubuntu-latest, config: openssl-1.1.1_stable } - { target: ubuntu-latest, config: openssl-3.0 } # stable branch + - { target: ubuntu-latest, config: zlib-develop } - { target: ubuntu-22.04, config: pam } - { target: ubuntu-22.04, config: krb5 } - { target: ubuntu-22.04, config: heimdal } |