From ba73ee661ed8b79b1f941cab40951ea0e3a83985 Mon Sep 17 00:00:00 2001 From: Thijs Schreijer Date: Thu, 23 Mar 2023 15:08:43 +0100 Subject: [PATCH 1/2] fix(ld_path): setting the LD_LIBRARY_PATH broke some tools jq and httpie --- README.md | 3 +++ pongo.sh | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 26a6016d..f277ced1 100644 --- a/README.md +++ b/README.md @@ -817,6 +817,9 @@ The result should be a new PR on the Pongo repo. [#384](https://github.com/Kong/kong-pongo/pull/384). * Fix: compile rocks using the Kong shipped crypto libraries [#382](https://github.com/Kong/kong-pongo/pull/382). +* Fix: setting the LD_PATH broke some other tools. If needed now has to be set + on a per-plugin basis. + [#390](https://github.com/Kong/kong-pongo/pull/390). --- diff --git a/pongo.sh b/pongo.sh index c4a2e5e3..55cc8118 100755 --- a/pongo.sh +++ b/pongo.sh @@ -1143,7 +1143,6 @@ function main { -e KONG_LICENSE_DATA \ -e KONG_TEST_DONT_CLEAN \ -e PONGO_CLIENT_VERSION="$PONGO_VERSION" \ - -e LD_LIBRARY_PATH=/kong-plugin:/usr/local/kong/lib \ kong \ "$WINDOWS_SLASH/bin/bash" "-c" "bin/busted --helper=$WINDOWS_SLASH/pongo/busted_helper.lua ${busted_params[*]} ${busted_files[*]}" ;; @@ -1213,7 +1212,6 @@ function main { -e KONG_CUSTOM_PLUGINS="$CUSTOM_PLUGINS" \ -e PS1_KONG_VERSION="$shellprompt" \ -e PS1_REPO_NAME="$repository_name" \ - -e LD_LIBRARY_PATH="/kong-plugin:/usr/local/kong/lib" \ $script_mount \ $history_mount \ kong $exec_cmd From adfc8d4568dcf12fe896cd040427f53f28124403 Mon Sep 17 00:00:00 2001 From: Thijs Schreijer Date: Thu, 23 Mar 2023 15:23:33 +0100 Subject: [PATCH 2/2] release 2.6.0 --- README.md | 12 ++++++++++-- pongo.sh | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f277ced1..fa18bb02 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ check [this blogpost on the Kong website](https://konghq.com/blog/custom-lua-plu | | | (_) | | | | (_| | (_) | \_| \___/|_| |_|\__, |\___/ __/ | - |___/ v2.5.0 + |___/ v2.6.0 Usage: pongo action [options...] [--] [action options...] @@ -811,12 +811,20 @@ The result should be a new PR on the Pongo repo. --- -## 2.5.x unreleased +## 2.6.0 released 23-Mar-2023 + +* Feat: Kong OSS 3.2.2 + +* Feat: Kong Enterprise 3.2.2.0 + +* Feat: Kong Enterprise 3.2.1.0 * Fix: Add missing `fuser` and `netstat` utility that is required for certain test functions [#384](https://github.com/Kong/kong-pongo/pull/384). + * Fix: compile rocks using the Kong shipped crypto libraries [#382](https://github.com/Kong/kong-pongo/pull/382). + * Fix: setting the LD_PATH broke some other tools. If needed now has to be set on a per-plugin basis. [#390](https://github.com/Kong/kong-pongo/pull/390). diff --git a/pongo.sh b/pongo.sh index 55cc8118..2ac83fbb 100755 --- a/pongo.sh +++ b/pongo.sh @@ -4,7 +4,7 @@ function globals { # Project related global variables - PONGO_VERSION=2.5.0 + PONGO_VERSION=2.6.0 local script_path # explicitly resolve the link because realpath doesn't do it on Windows