From: Stefan Eissing <icing@apache.org>
Date: Wed, 3 May 2023 08:27:20 +0000 (+0000)
Subject: enable github workflows for testing http2 and mod_tls
X-Git-Tag: 2.4.58-rc1-candidate~143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=382aba75811fc71c1cf91afe992383413de3b7eb;p=thirdparty%2Fapache%2Fhttpd.git

enable github workflows for testing http2 and mod_tls



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909588 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 354028278cc..17ae1586815 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -178,20 +178,18 @@ jobs:
               TEST_ASAN=1
               CLEAR_CACHE=1
           # -------------------------------------------------------------------------
-          ### TODO: if: *condition_not_24x
-          ### TODO: fails in tests.
-          # - name: HTTP/2 test suite
-          #   config: --enable-mods-shared=reallyall --with-mpm=event --enable-mpms-shared=all
-          #   pkgs: curl python3-pytest nghttp2-client python3-cryptography python3-requests
-          #   env: |
-          #     APR_VERSION=1.7.4
-          #     APU_VERSION=1.6.3
-          #     APU_CONFIG="--with-crypto"
-          #     NO_TEST_FRAMEWORK=1
-          #     TEST_INSTALL=1
-          #     TEST_H2=1
-          #     TEST_CORE=1
-          #     TEST_PROXY=1
+          - name: HTTP/2 test suite
+            config: --enable-mods-shared=reallyall --with-mpm=event --enable-mpms-shared=all
+            pkgs: curl python3-pytest nghttp2-client python3-cryptography python3-requests python3-multipart
+            env: |
+              APR_VERSION=1.7.4
+              APU_VERSION=1.6.3
+              APU_CONFIG="--with-crypto"
+              NO_TEST_FRAMEWORK=1
+              TEST_INSTALL=1
+              TEST_H2=1
+              TEST_CORE=1
+              TEST_PROXY=1
           # -------------------------------------------------------------------------
           ### TODO: if: *condition_not_24x
           ### TODO: pebble install is broken.
@@ -211,18 +209,17 @@ jobs:
           # -------------------------------------------------------------------------
           ### TODO: if: *condition_not_24x
           ### TODO: fix caching here.
-          ### TODO: make it pass (see e.g. https://github.com/apache/httpd/actions/runs/4467336705/jobs/7846666316)
-          #- 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 cargo cbindgen
-          #  env: |
-          #    APR_VERSION=1.7.4
-          #    APU_VERSION=1.6.3
-          #    APU_CONFIG="--with-crypto"
-          #    NO_TEST_FRAMEWORK=1
-          #    TEST_INSTALL=1
-          #    TEST_MOD_TLS=1
-          #    CLEAR_CACHE=1
+          - 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 cargo cbindgen
+            env: |
+              APR_VERSION=1.7.4
+              APU_VERSION=1.6.3
+              APU_CONFIG="--with-crypto"
+              NO_TEST_FRAMEWORK=1
+              TEST_INSTALL=1
+              TEST_MOD_TLS=1
+              CLEAR_CACHE=1
           # -------------------------------------------------------------------------
           ### TODO if: *condition_not_24x
           ### TODO: Fails because :i386 packages are not being found.
diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index f7a72d29f82..f2586dd4484 100755
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -58,12 +58,9 @@ fi
 # build the version we want from source
 if test -v TEST_MOD_TLS; then
   RUSTLS_HOME="$HOME/build/rustls-ffi"
-  RUSTLS_VERSION="v0.9.0"
-  git clone https://github.com/rustls/rustls-ffi.git "$RUSTLS_HOME"
+  RUSTLS_VERSION="v0.10.0"
+  git clone -b "$RUSTLS_VERSION" https://github.com/rustls/rustls-ffi.git "$RUSTLS_HOME"
   pushd "$RUSTLS_HOME"
-    # since v0.9.0, there is no longer a dependency on cbindgen
-    git fetch origin
-    git checkout tags/$RUSTLS_VERSION
     make install DESTDIR="$PREFIX"
   popd
   CONFIG="$CONFIG --with-tls --with-rustls=$PREFIX"