From f48d531a593c2e454decf4f1d3a5265ebabcf6b2 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Tue, 3 Nov 2026 15:33:54 +0800 Subject: [PATCH] ci: fix OpenResty install on Ubuntu 26.04 runners and LuaRocks in E2E CI: ubuntu-latest is now Ubuntu 26.04, which no longer ships apt-key, and OpenResty publishes apt packages only up to noble. Add the OpenResty key to a keyring with signed-by and use the noble repo. OpenResty's packages bundle their own OpenSSL, PCRE2 and zlib, so they install on 26.04. E2E: the openresty/openresty:1.17.8.2-5-alpine-fat image ships an old LuaRocks whose LuaJIT can no longer load the luarocks.org manifest ("main function has more than 65536 constants", luarocks/luarocks#1797), so lua-resty-http could not be installed. Use 1.31.8.1-0-alpine-fat, which ships LuaRocks 3.13.0. Generated-by: Kiro Crew (claude-opus-5.5) --- .github/workflows/ci.yaml | 9 +++++---- test/e2e/nginx/Dockerfile | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bb4daa5..a0b9f6c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -62,10 +62,11 @@ jobs: sudo luarocks install lua-resty-jit-uuid - name: "Install OpenResty" run: | - wget -qO - https://openresty.org/package/pubkey.gpg | sudo apt-key add - - sudo apt-get -y update --fix-missing - sudo apt-get -y install software-properties-common - sudo add-apt-repository -y "deb http://openresty.org/package/ubuntu $(lsb_release -sc) main" + # apt-key is gone on current Ubuntu runners, and OpenResty publishes apt packages + # only up to noble. Its packages bundle their own OpenSSL, PCRE2 and zlib, so the + # noble repo installs on newer Ubuntu releases too. + wget -qO - https://openresty.org/package/pubkey.gpg | sudo gpg --dearmor -o /usr/share/keyrings/openresty.gpg + echo "deb [signed-by=/usr/share/keyrings/openresty.gpg] http://openresty.org/package/ubuntu noble main" | sudo tee /etc/apt/sources.list.d/openresty.list sudo apt-get update sudo apt-get install openresty-debug - name: "Install test::nginx for testing" diff --git a/test/e2e/nginx/Dockerfile b/test/e2e/nginx/Dockerfile index 8eb4af4..e923e0a 100644 --- a/test/e2e/nginx/Dockerfile +++ b/test/e2e/nginx/Dockerfile @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM openresty/openresty:1.17.8.2-5-alpine-fat +FROM openresty/openresty:1.31.8.1-0-alpine-fat WORKDIR /skywalking-nginx-lua