From b8434b4d59609812ba5db9179e4ff15e7f9b3350 Mon Sep 17 00:00:00 2001 From: Aapo Talvensaari Date: Wed, 19 Jun 2024 20:00:29 +0300 Subject: [PATCH] feat(lib): remove version check from resty.events --- .github/workflows/build_and_test_with_resty_events.yml | 3 +-- .github/workflows/build_and_test_with_worker_events.yml | 2 +- lib/resty/healthcheck.lua | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_and_test_with_resty_events.yml b/.github/workflows/build_and_test_with_resty_events.yml index 6a09c99..6931346 100644 --- a/.github/workflows/build_and_test_with_resty_events.yml +++ b/.github/workflows/build_and_test_with_resty_events.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - openresty-version: [1.19.9.1, 1.21.4.1, 1.21.4.3, 1.25.3.1] + openresty-version: [1.19.9.1, 1.21.4.3, 1.25.3.1] steps: - name: Update and install OS dependencies @@ -75,7 +75,6 @@ jobs: - name: Checkout lua-resty-events uses: actions/checkout@v3 - if: steps.cache-deps.outputs.cache-hit != 'true' with: repository: Kong/lua-resty-events ref: refs/tags/0.2.1 diff --git a/.github/workflows/build_and_test_with_worker_events.yml b/.github/workflows/build_and_test_with_worker_events.yml index 73067ac..f2d88ec 100644 --- a/.github/workflows/build_and_test_with_worker_events.yml +++ b/.github/workflows/build_and_test_with_worker_events.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - openresty-version: [1.21.4.1] + openresty-version: [1.21.4.3] steps: - name: Update and install OS dependencies diff --git a/lib/resty/healthcheck.lua b/lib/resty/healthcheck.lua index 0782da9..561948d 100644 --- a/lib/resty/healthcheck.lua +++ b/lib/resty/healthcheck.lua @@ -48,7 +48,6 @@ local type = type local assert = assert -local RESTY_EVENTS_VER = [[^0\.[12]\.\d+$]] local RESTY_WORKER_EVENTS_VER = "0.3.3" @@ -113,8 +112,6 @@ local function load_events_module(self) elseif self.events_module == "resty.events" then worker_events = require("resty.events.compat") - local version_match = ngx.re.match(worker_events._VERSION, RESTY_EVENTS_VER, "o") - assert(version_match, "unsupported lua-resty-events version") else error("unknown events module")