Skip to content
This repository has been archived by the owner on Oct 12, 2022. It is now read-only.

Commit

Permalink
4.1.3
Browse files Browse the repository at this point in the history 
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)
  • Loading branch information
@heyanlong
heyanlong committed Jul 21, 2021
1 parent e064fc8 commit 78c0eb0
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 15 deletions.
6 changes: 3 additions & 3 deletions docs/BUILDING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 18 additions & 6 deletions package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
<email>[email protected]</email>
<active>yes</active>
</lead>
<date>2021-04-30</date>
<date>2021-07-21</date>
<version>
<release>4.1.2</release>
<api>4.1.2</api>
<release>4.1.3</release>
<api>4.1.3</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache2.0</license>
<notes>Add mysqli</notes>
<notes>Fix bugs</notes>
<contents>
<dir name="/">
<file role="doc" name="CREDITS"/>
Expand All @@ -45,7 +45,6 @@
<file role="doc" name="README.md"/>
<file role="src" name="config.m4"/>
<file role="src" name="config.w32"/>
<file role="src" name="docker/Dockerfile"/>
<file role="src" name="docker/Dockerfile.7.0"/>
<file role="src" name="docker/Dockerfile.7.1"/>
<file role="src" name="docker/Dockerfile.7.2"/>
Expand All @@ -55,8 +54,10 @@
<file role="src" name="docker/index.php"/>
<file role="src" name="docker/nginx.conf"/>
<file role="src" name="docker/service.sh"/>
<file role="doc" name="docs/API.md"/>
<file role="doc" name="docs/BUILDING.md"/>
<file role="doc" name="docs/CONFIG.md"/>
<file role="doc" name="docs/README.md"/>
<file role="doc" name="docs/install.md"/>
<file role="doc" name="docs/quick-start.md"/>
<file role="src" name="e2e/99-skywalking.ini"/>
<file role="src" name="e2e/composer.json"/>
Expand Down Expand Up @@ -149,6 +150,17 @@
<providesextension>skywalking</providesextension>
<extsrcrelease/>
<changelog>
<release>
<version>
<release>4.1.3</release>
<api>4.1.3</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<notes>Fix bugs</notes>
</release>
<release>
<version>
<release>4.1.2</release>
Expand Down
2 changes: 1 addition & 1 deletion php_skywalking.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
19 changes: 17 additions & 2 deletions scripts/package.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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': '/'},
Expand All @@ -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'},
Expand Down
6 changes: 3 additions & 3 deletions scripts/version.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
# limitations under the License.
#

VERSION=4.1.2
VERSION=4.1.3
OS=`uname`

echo "OS: $OS"
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

0 comments on commit 78c0eb0

Please sign in to comment.