From 6ba16380c4bb4a0fe7b566231063dc1825011901 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Thu, 29 Feb 2024 12:36:11 +0000
Subject: [PATCH 1/3] CI: try caching rustls build in ~/root/rustls; add
 version to the environment so it's used in the cache key.

---
 .github/workflows/linux.yml |  1 +
 test/travis_before_linux.sh | 12 ++++++++++++
 test/travis_run_linux.sh    |  8 +-------
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index aefbeee79b9..881e68642a9 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -244,6 +244,7 @@ jobs:
               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
diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
index bd468f5a702..b816de4cde3 100755
--- a/test/travis_before_linux.sh
+++ b/test/travis_before_linux.sh
@@ -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
diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index fc082abde52..953198e59ee 100755
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -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

From 0712578dba1892974ba019f069620d1127591880 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Thu, 29 Feb 2024 13:01:11 +0000
Subject: [PATCH 2/3] Noop.


From 3cc6b2064d70c5ee1d6545a35830bd17f77a40ff Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Thu, 29 Feb 2024 13:06:52 +0000
Subject: [PATCH 3/3] Actually allow caching for the mod_tls test.

---
 .github/workflows/linux.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 881e68642a9..d4b25799654 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -236,7 +236,6 @@ 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
@@ -248,7 +247,6 @@ jobs:
               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: |