Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: try caching rustls build in ~/root/rustls #416

Closed
wants to merge 3 commits into from
Closed

CI: try caching rustls build in ~/root/rustls #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ba1638
CI: try caching rustls build in ~/root/rustls; add version
notroj Feb 29, 2024
0712578
Noop.
notroj Feb 29, 2024
3cc6b20
Actually allow caching for the mod_tls test.
notroj Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,18 +236,17 @@ jobs:
# TEST_MD=1
# -------------------------------------------------------------------------
### TODO: if: *condition_not_24x
### TODO: fix caching here.
- name: MOD_TLS test suite
config: --enable-mods-shared=reallyall --with-mpm=event --enable-mpms-shared=event
pkgs: curl python3-pytest nghttp2-client python3-cryptography python3-requests python3-multipart python3-filelock python3-websockets cargo cbindgen
env: |
APR_VERSION=1.7.4
APU_VERSION=1.6.3
APU_CONFIG="--with-crypto"
RUSTLS_VERSION="v0.10.0"
NO_TEST_FRAMEWORK=1
TEST_INSTALL=1
TEST_MOD_TLS=1
CLEAR_CACHE=1
- name: Configured w/reduced exports
config: --enable-reduced-exports --enable-maintainer-mode
env: |
Expand Down
12 changes: 12 additions & 0 deletions test/travis_before_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,3 +147,15 @@ if test -v APU_VERSION; then
install_apx apr-util ${APU_VERSION} "${APU_CONFIG}" --with-apr=$HOME/build/apr-${APR_VERSION}
ldd $HOME/root/apr-util-${APU_VERSION}/lib/libaprutil-?.so || true
fi

# Since librustls is not a package (yet) on any platform, we
# build the version we want from source
if test -v TEST_MOD_TLS -a -v RUSTLS_VERSION; then
if ! test -d $HOME/root/rustls; then
RUSTLS_HOME="$HOME/build/rustls-ffi"
git clone -b "$RUSTLS_VERSION" https://github.com/rustls/rustls-ffi.git "$RUSTLS_HOME"
pushd "$RUSTLS_HOME"
make install DESTDIR="$HOME/root/rustls"
popd
fi
fi
8 changes: 1 addition & 7 deletions test/travis_run_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,7 @@ fi
# Since librustls is not a package (yet) on any platform, we
# build the version we want from source
if test -v TEST_MOD_TLS; then
RUSTLS_HOME="$HOME/build/rustls-ffi"
RUSTLS_VERSION="v0.10.0"
git clone -b "$RUSTLS_VERSION" https://github.com/rustls/rustls-ffi.git "$RUSTLS_HOME"
pushd "$RUSTLS_HOME"
make install DESTDIR="$PREFIX"
popd
CONFIG="$CONFIG --with-tls --with-rustls=$PREFIX"
CONFIG="$CONFIG --with-tls --with-rustls=$HOME/root/rustls"
fi

if test -v TEST_OPENSSL3; then
Expand Down
Loading