From 07d229c41781377d997cc0068a364f7f95ca0c28 Mon Sep 17 00:00:00 2001 From: Ashish Tiwari Date: Mon, 9 Dec 2024 23:15:09 +0530 Subject: [PATCH 1/2] fix: pin test-nginx to a working version to fix tests with http2 --- ci/linux_openresty_common_runner.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ci/linux_openresty_common_runner.sh b/ci/linux_openresty_common_runner.sh index 1b73ceec92c6..658346abbbed 100755 --- a/ci/linux_openresty_common_runner.sh +++ b/ci/linux_openresty_common_runner.sh @@ -38,7 +38,15 @@ do_install() { # sudo apt-get install tree -y # tree deps + # The latest version of test-nginx is not compatible with the current set of tests with ---http2 + # due to this commit: https://github.com/openresty/test-nginx/commit/0ccd106cbe6878318e5a591634af8f1707c411a6 + # This change pins test-nginx to a commit before this one. git clone --depth 1 https://github.com/openresty/test-nginx.git test-nginx + cd test-nginx + git fetch --depth=1 origin ced30a31bafab6c68873efb17b6d80f39bcd95f5 + git checkout ced30a31bafab6c68873efb17b6d80f39bcd95f5 + cd .. + make utils mkdir -p build-cache From e5b086af163e1e11c130594614d2c25ae8d276e2 Mon Sep 17 00:00:00 2001 From: Ashish Tiwari Date: Mon, 9 Dec 2024 23:21:48 +0530 Subject: [PATCH 2/2] fix lint --- ci/linux_openresty_common_runner.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/linux_openresty_common_runner.sh b/ci/linux_openresty_common_runner.sh index 658346abbbed..6dda698ffefc 100755 --- a/ci/linux_openresty_common_runner.sh +++ b/ci/linux_openresty_common_runner.sh @@ -38,7 +38,7 @@ do_install() { # sudo apt-get install tree -y # tree deps - # The latest version of test-nginx is not compatible with the current set of tests with ---http2 + # The latest version of test-nginx is not compatible with the current set of tests with ---http2 # due to this commit: https://github.com/openresty/test-nginx/commit/0ccd106cbe6878318e5a591634af8f1707c411a6 # This change pins test-nginx to a commit before this one. git clone --depth 1 https://github.com/openresty/test-nginx.git test-nginx