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