From 78c0eb01d4afd3d40b78873946c8be385a9d18bf Mon Sep 17 00:00:00 2001 From: heyanlong Date: Wed, 21 Jul 2021 11:12:59 +0800 Subject: [PATCH] 4.1.3 Feature: Redis bitpos/bitop/setbit/getbit/incrby/decrby/incrbyfloat/setrange/getrange/mset/msetnx/eval (#367) Fix: #372 (#373) Feature: gRPC static library (#375) Fix: sky_curl_setopt_handler (#378) Fix: segment fault when swoole request header is empty. (#374) Fix: #377 (#381) Feature: Skywalking-eyes (#368) Feature: Swoft (#395) --- docs/BUILDING.md | 6 +++--- package.xml | 24 ++++++++++++++++++------ php_skywalking.h | 2 +- scripts/package.py | 19 +++++++++++++++++-- scripts/version.sh | 6 +++--- 5 files changed, 42 insertions(+), 15 deletions(-) diff --git a/docs/BUILDING.md b/docs/BUILDING.md index e5915fd5..5f4e37ff 100644 --- a/docs/BUILDING.md +++ b/docs/BUILDING.md @@ -46,9 +46,9 @@ To build gRPC from source, you may need to install the following packages from H Use the `--with-grpc` option to set the path of the gRPC static library ```shell script -curl -Lo v4.1.2.tar.gz https://github.com/SkyAPM/SkyAPM-php-sdk/archive/v4.1.2.tar.gz -tar zxvf v4.1.2.tar.gz -cd SkyAPM-php-sdk-4.1.2 +curl -Lo v4.1.3.tar.gz https://github.com/SkyAPM/SkyAPM-php-sdk/archive/v4.1.3.tar.gz +tar zxvf v4.1.3.tar.gz +cd SkyAPM-php-sdk-4.1.3 phpize ./configure --with-grpc="/var/local/git/grpc" make diff --git a/package.xml b/package.xml index fc4ef522..40943f52 100644 --- a/package.xml +++ b/package.xml @@ -26,17 +26,17 @@ yanlong@php.net yes - 2021-04-30 + 2021-07-21 - 4.1.2 - 4.1.2 + 4.1.3 + 4.1.3 stable stable Apache2.0 - Add mysqli + Fix bugs @@ -45,7 +45,6 @@ - @@ -55,8 +54,10 @@ + + + - @@ -149,6 +150,17 @@ skywalking + + + 4.1.3 + 4.1.3 + + + stable + stable + + Fix bugs + 4.1.2 diff --git a/php_skywalking.h b/php_skywalking.h index 3859abae..e6b786e0 100644 --- a/php_skywalking.h +++ b/php_skywalking.h @@ -62,7 +62,7 @@ SKY_BEGIN_EXTERN_C() extern zend_module_entry skywalking_module_entry; #define phpext_skywalking_ptr &skywalking_module_entry -#define PHP_SKYWALKING_VERSION "4.1.2" +#define PHP_SKYWALKING_VERSION "4.1.3" #define SKY_STRCMP(s1, s2) ((s1) != nullptr && strcmp(s1, s2) == 0) diff --git a/scripts/package.py b/scripts/package.py index 13dbc262..36759129 100644 --- a/scripts/package.py +++ b/scripts/package.py @@ -16,7 +16,7 @@ import xml.dom.minidom import time, os -version = '4.1.2' +version = '4.1.3' git = os.popen('git ls-files') res = git.read() @@ -79,7 +79,7 @@ {'key': 'license', 'value': 'Apache2.0', 'attr': [ {'key': 'uri', 'value': 'http://www.apache.org/licenses/LICENSE-2.0.html'} ]}, - {'key': 'notes', 'value': 'Add mysqli'}, # release notes + {'key': 'notes', 'value': 'Fix bugs'}, # release notes {'key': 'contents', 'child': [ {'key': 'dir', 'attr': [ {'key': 'name', 'value': '/'}, @@ -98,6 +98,21 @@ {'key': 'providesextension', 'value': 'skywalking'}, {'key': 'extsrcrelease'}, {'key': 'changelog', 'child': [ + {'key': 'release', 'child': [ + {'key': 'version', 'child': [ + {'key': 'release', 'value': '4.1.3'}, + {'key': 'api', 'value': '4.1.3'} + ] + }, + {'key': 'stability', 'child': [ + {'key': 'release', 'value': 'stable'}, + {'key': 'api', 'value': 'stable'} + ] + }, + {'key': 'notes', 'value': 'Fix bugs'} + ] + }, + {'key': 'release', 'child': [ {'key': 'version', 'child': [ {'key': 'release', 'value': '4.1.2'}, diff --git a/scripts/version.sh b/scripts/version.sh index dff0364d..387580b7 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -15,7 +15,7 @@ # limitations under the License. # -VERSION=4.1.2 +VERSION=4.1.3 OS=`uname` echo "OS: $OS" @@ -23,6 +23,6 @@ echo "version: $VERSION" if [ "$OS" = 'Darwin' ]; then sed -i '' "s/\"[0-9].[0-9].[0-9]\"/\"$VERSION\"/" php_skywalking.h - sed -i '' "s/v[0-9].[0-9].[0-9].tar.gz/v$VERSION.tar.gz/g" docs/install.md - sed -i '' "s/k-[0-9].[0-9].[0-9]/k-$VERSION/" docs/install.md + sed -i '' "s/v[0-9].[0-9].[0-9].tar.gz/v$VERSION.tar.gz/g" docs/BUILDING.md + sed -i '' "s/k-[0-9].[0-9].[0-9]/k-$VERSION/" docs/BUILDING.md fi \ No newline at end of file