Skip to content

Commit f10b0c5

Browse files
su-changhuanwj-Mcatdiaozxin007dependabot-preview[bot]
authored
merge master 0.20.19 (#1)
* fix: correct spell mistakes * 0.13.10 * This is a breaking change! * change python proto package name * update the version of chatie_grpc * try to install request (grpc/grpc-node#922 (comment)) * 0.15.2 * add grpc debug client link * update setup.py to fix pypi bug (wechaty#59) * update setup to fix pypi bug * change chatie-grpc generated dir * 0.15.2 * 0.15.3 (wechaty#60) * keep the package dir name in site-packages as `chatie_grpc` (wechaty#62) * 0.15.3 * keep package name as chatie_grpc not chatie-grpc * 0.15.4 (wechaty#63) * deploy release jar (wechaty#61) * fix maven,deploy jar to center oss * fix maven,deploy jar to center oss * add java to README.md * use better relative path for proto_path (zxh0/vscode-proto3#31 (comment)) * 0.15.5 * update pypi install_requires config (wechaty#64) * 0.15.4 * add install_requires * 0.15.5 * 0.15.6 * add NOTICE * 0.13.10 * 0.16.0 * 0.16.1 * Bump @chatie/tsconfig from 0.8.0 to 0.10.1 (wechaty#70) Bumps [@chatie/tsconfig](https://github.com/Chatie/tsconfig) from 0.8.0 to 0.10.1. - [Release notes](https://github.com/Chatie/tsconfig/releases) - [Commits](https://github.com/Chatie/tsconfig/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Bump grpc_tools_node_protoc_ts from 2.5.11 to 4.0.0 (wechaty#69) Bumps [grpc_tools_node_protoc_ts](https://github.com/agreatfool/grpc_tools_node_protoc_ts) from 2.5.11 to 4.0.0. - [Release notes](https://github.com/agreatfool/grpc_tools_node_protoc_ts/releases) - [Commits](agreatfool/grpc_tools_node_protoc_ts@v2.5.11...v4.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Bump @chatie/git-scripts from 0.2.5 to 0.6.2 (wechaty#68) Bumps [@chatie/git-scripts](https://github.com/Chatie/git-scripts) from 0.2.5 to 0.6.2. - [Release notes](https://github.com/Chatie/git-scripts/releases) - [Commits](https://github.com/Chatie/git-scripts/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Update betterproto (wechaty#46) * specify python v3 * 0.16.2 * add php rpc (wechaty#76) * add php grpc * update usage * update usage * update usage * update * update usage * add php rpc * add PHP Grpc & maintainers * 0.16.3 * add all codeowners for languages * 0.16.4 * Bump @chatie/eslint-config from 0.8.1 to 0.12.1 (wechaty#75) Bumps [@chatie/eslint-config](https://github.com/Chatie/eslint-config) from 0.8.1 to 0.12.1. - [Release notes](https://github.com/Chatie/eslint-config/releases) - [Commits](https://github.com/Chatie/eslint-config/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * fix eslint * 0.16.5 * add php action (wechaty#78) * add php action * add php action * add php action * add php action * add php action * add php action * add php action * add php action * add php action * add php action * add php action * add php action * tune layout for source code * Update README.md * v0.17 * fix to v0.17 * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * fix github url * 0.16.2 * 0.17.1 * add dirty rpc function definition for sync data (wechaty#79) * add dirty rpc function definition for sync data * try to fix tests * add rpc roomMemberPayloadDirty * add dirty event type * revise code according to comments * modify dirty methods and event * try to fix build * modify code according to review * fix build * hope this is the final build fix * this must be the final final build fix * fix proto naming convention * change property name according to comment * Update package.json * Update package.json Co-authored-by: Huan (李卓桓) <zixia@zixia.net> * add contact phone rpc call definition (wechaty#80) * add more methods related to new wechaty-puppept update (wechaty#81) * add more methods related to new wechaty-puppept update * fix test * fix typo and order * 0.17.3 * fix request structure according to comments * add phone to contact payload (wechaty#82) * bump version to publish new changes (wechaty#83) * add csharp nuget (wechaty#84) * proto add csharp namespace * add csharp solution * update * csharp add build powshell * Create csharp.yml * update csharp.yaml * update copy.ps1 * add test * test * update common.ps1 * test action args key * test powshell args * test github Secrets * update yaml * update nuget package as rohith/publish-nuget@v2 * update version info * github action add nuget VERSION_FILE_PATH * chsarp github action over * recovery github action * clear * update gitgnore * delete .vs folder * update README.md for csharp * README.md update csharp grpc doc * README.md add nuget introduction * add file stream and image stream rpc call (wechaty#88) * add file stream and image stream rpc call * fix test * 0.17.5 * add imageType to MessageImageStreamRequest * add @deprecated to MessageFile and MessageImage rpc * add change history in readme * 0.18.0 * Bump grpc_tools_node_protoc_ts from 4.1.5 to 5.0.0 (wechaty#87) Bumps [grpc_tools_node_protoc_ts](https://github.com/agreatfool/grpc_tools_node_protoc_ts) from 4.1.5 to 5.0.0. - [Release notes](https://github.com/agreatfool/grpc_tools_node_protoc_ts/releases) - [Commits](agreatfool/grpc_tools_node_protoc_ts@v4.1.5...v5.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Bump ts-protoc-gen from 0.12.0 to 0.13.0 (wechaty#86) Bumps [ts-protoc-gen](https://github.com/improbable-eng/ts-protoc-gen) from 0.12.0 to 0.13.0. - [Release notes](https://github.com/improbable-eng/ts-protoc-gen/releases) - [Changelog](https://github.com/improbable-eng/ts-protoc-gen/blob/master/CHANGELOG.md) - [Commits](improbable-eng/ts-protoc-gen@0.12.0...0.13.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Send message stream (wechaty#89) * add sendFileStream rpc call * add sendFileStream into puppet server impl * add readme * 0.18.1 * change filebox to data with bytes type * add name attribute into stream request and response * Fix go ci (wechaty#91) * Fix go ci * Update go.yml * add go_package * debug github action * debug github action * debug github action * keep the latest betterproto version (wechaty#92) * Use metadata (wechaty#93) * use metadata send extra info, remove extra attributes in stream message * 0.18.2 * use common message to send FileBox * rename FileBoxMessage to FileBoxChunk * use data instead of chunk * 0.18.3 * Update README.md * Improve stream message (wechaty#95) * improve stream message definition * 0.18.4 * change names * wip... * normalize name * 0.18.5 * normalize name * 0.18.6 * rename request & responses for more robust * clean name * 0.18.7 Co-authored-by: Huan LI (李卓桓) <zixia@zixia.net> * Export file box (wechaty#98) * export filebox from generated ts file * 0.18.8 * add some stream notices comments * 0.18.9 * fix file rename * 0.18.10 * link to wechaty#99 * 0.18.11 * fix go-grpc generate failed (wechaty#101) * 0.18.12 * fix .net grpc for the new file file_box.proto and update TargetFramework to netstandard2.0 (wechaty#104) * init openapi * Rename & Add OpenAPI Specification Generator (wechaty#107) * rename npm name to wechaty-grpc (wechaty#106) * add grpc http annotations (wip) * add grpc gateway image * add swagger info annotation * make payload dirty restful * fix name * add more restful endpoint definitions * fix streaming methods * better protoc tools installer script * clean openapi scripts * rename src/index -> src/mod * generate proto js files with annotation * 0.19.1 * add gRPC Web example * 0.19.2 * wechaty-grpc v0.20 * 0.20.1 * lint * check protoc version to make sure >= 3.5 (wechaty#116) * test ok * upgrade all deps * add more node version for testing * 0.20.2 * use @master version of github actions, enable cache * install 3rd party protos * 0.20.3 * fix npm publish * 0.20.4 * add openApi & proto for export (wechaty#119) * add openApi & proto for export * open-api -> openapi * 0.20.5 * Pypi rename wechaty grpc (wechaty#118) * follow latest grpc proto annotations & rename * deprecate merge-rpoto.sh (wechaty#46) * install third party proto files * 0.20.5 * install proto by github actions * 0.20.6 * add cache for pypi install * 0.20.7 * use abs path for install * 0.20.8 * explicit python3 & pip3 * 0.20.9 * 0.20.10 * 0.20.11 * sync swagger version to gRPC * 0.20.12 * compatible with grpc-dynamic-gateway (konsumer/grpc-dynamic-gateway#50) * cean * fix * 0.20.13 * use proto full path & fix openapi * 0.20.14 * fix python proto path * 0.20.15 * add openapi link * 0.20.16 * a workaround to fix issue wechaty#120 * clean * 0.20.17 * fix name * 0.20.18 * specify beta version for install * 0.20.19 Co-authored-by: Huan (李卓桓) <zixia@zixia.net> Co-authored-by: wj-Mcat <1435130236@qq.com> Co-authored-by: 犀利豆 <diaozxin@163.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: 一路向北 <zhangchunsheng423@gmail.com> Co-authored-by: Yuan Gao <wind.memory.cn@gmail.com> Co-authored-by: Darren <jesn2013@hotmail.com> Co-authored-by: 小雨 <614422099@QQ.com> Co-authored-by: Chao Fei <dchaofei@163.com>
1 parent db6a491 commit f10b0c5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1815
-347
lines changed

.github/CODEOWNERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#
2+
# https://help.github.com/articles/about-codeowners/
3+
#
4+
5+
/php/ @zhangchunsheng
6+
/python/ @wj-Mcat
7+
/java/ @diaozxin007
8+
/go/ @dchaofei

.github/workflows/csharp.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: "csharp"
2+
on:
3+
push:
4+
branches: [ master ]
5+
pull_request:
6+
branches: [ master ]
7+
jobs:
8+
build-push:
9+
runs-on: windows-latest
10+
steps:
11+
- uses: actions/checkout@v2
12+
- uses: actions/setup-dotnet@master
13+
with:
14+
dotnet-version: 3.1.100
15+
16+
- name: copy wechaty proto
17+
run: .\copy.ps1
18+
working-directory: .\csharp\Wechaty.Grpc\buildTool
19+
shell: powershell
20+
21+
- name: publish on version change
22+
uses: rohith/publish-nuget@v2
23+
with:
24+
PROJECT_FILE_PATH: .\csharp\Wechaty.Grpc\Wechaty.Grpc.csproj
25+
VERSION_FILE_PATH: .\csharp\Wechaty.Grpc\common.props
26+
NUGET_KEY: ${{ secrets.NUGET_APIKEY }}

.github/workflows/go.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ jobs:
3030
run: |
3131
cd go
3232
make generate
33+
rm -rf `go env GOPATH`/src/github.com/wechaty/go-grpc/wechaty
34+
ln -s `pwd`/generated/wechaty/ `go env GOPATH`/src/github.com/wechaty/go-grpc/wechaty
3335
go build -v generated/wechaty/puppet.pb.go
3436
3537
publish:

.github/workflows/maven-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
settings-path: ${{ github.workspace }} # location for the settings.xml file
2323

2424
- name: Build with Maven
25-
run: mvn -B package --file pom.xml
25+
run: mvn -B package --file java/pom.xml
2626

2727
- name: Publish to GitHub Packages Apache Maven
2828
run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml

.github/workflows/maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
with:
2222
java-version: 1.8
2323
- name: Build with Maven
24-
run: mvn -B package --file pom.xml
24+
run: mvn -B package --file java/pom.xml

.github/workflows/node.js.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,34 @@ jobs:
1414
strategy:
1515
matrix:
1616
os: [macos-latest, ubuntu-latest]
17-
node-version: [10.x, 11.x, 12.x]
17+
node-version: [10.x, 11.x, 12.x, 14.x, 15]
1818
runs-on: ${{ matrix.os }}
1919

2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@master
2222
- name: Use Node.js ${{ matrix.node-version }}
23-
uses: actions/setup-node@v1
23+
uses: actions/setup-node@master
2424
with:
2525
node-version: ${{ matrix.node-version }}
26-
- name: Set up Go 1.14
26+
- name: Set up Go
2727
uses: actions/setup-go@master
28-
with:
29-
stable: false
30-
go-version: 1.14
3128
id: go
3229

3330
- name: Install Protoc
3431
uses: arduino/setup-protoc@master
3532
with:
3633
repo-token: ${{ secrets.GITHUB_TOKEN }}
3734

35+
- uses: actions/cache@master
36+
with:
37+
path: ~/.npm
38+
key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }}
39+
restore-keys: |
40+
${{ runner.os }}-node-
3841
- name: Install Dependencies
3942
run: |
4043
npm install
41-
npm run install:lint:protoc
44+
npm run install:protoc
4245
4346
- name: Generate gRPC Stubs
4447
run: npm run generate

.github/workflows/npm.yml

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,27 @@ jobs:
77
name: Build
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v2
10+
- uses: actions/checkout@master
1111
- name: Use Node.js 12
12-
uses: actions/setup-node@v1
12+
uses: actions/setup-node@master
1313
with:
1414
node-version: 12
15-
- name: Set up Go 1.14
15+
- name: Set up Go
1616
uses: actions/setup-go@master
17-
with:
18-
stable: false
19-
go-version: 1.14
2017
id: go
2118
- name: Install Protoc
2219
uses: arduino/setup-protoc@master
2320

21+
- uses: actions/cache@master
22+
with:
23+
path: ~/.npm
24+
key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }}
25+
restore-keys: |
26+
${{ runner.os }}-node-
2427
- name: Install Dependencies
2528
run: |
2629
npm install
27-
npm run install:lint:protoc
30+
npm run install:protoc
2831
2932
- name: Generate gRPC Stubs
3033
run: npm run generate
@@ -37,13 +40,24 @@ jobs:
3740
needs: build
3841
runs-on: ubuntu-latest
3942
steps:
40-
- uses: actions/checkout@v2
41-
- uses: actions/setup-node@v1
43+
- uses: actions/checkout@master
44+
- uses: actions/setup-node@master
4245
with:
4346
node-version: 12
47+
- uses: actions/cache@master
48+
with:
49+
path: ~/.npm
50+
key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }}
51+
restore-keys: |
52+
${{ runner.os }}-node-
53+
- name: Set up Go
54+
uses: actions/setup-go@master
55+
id: go
4456

4557
- name: Install Protoc
4658
uses: arduino/setup-protoc@master
59+
- name: Install Protoc 3rd party protos
60+
run: npm run install:protoc
4761

4862
- name: Install Dependencies
4963
run: npm install
@@ -60,13 +74,22 @@ jobs:
6074
needs: [build, pack]
6175
runs-on: ubuntu-latest
6276
steps:
63-
- uses: actions/checkout@v2
64-
- uses: actions/setup-node@v1
77+
- uses: actions/checkout@master
78+
- uses: actions/setup-node@master
6579
with:
6680
node-version: 12
6781
registry-url: https://registry.npmjs.org/
82+
- uses: actions/cache@master
83+
with:
84+
path: ~/.npm
85+
key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }}
86+
restore-keys: |
87+
${{ runner.os }}-node-
88+
6889
- name: Install Protoc
6990
uses: arduino/setup-protoc@master
91+
- name: Install Protoc 3rd party protos
92+
run: npm run install:protoc
7093

7194
- name: Install Dependencies
7295
run: npm install

.github/workflows/php.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# For more information see: https://docs.github.com/en/actions/getting-started-with-github-actions
2+
# For more setup-php see: https://github.com/shivammathur/setup-php
3+
# For more setup-php protoc see: https://github.com/shivammathur/setup-php/issues/262
4+
5+
name: PHP
6+
7+
on: [push, pull_request]
8+
9+
jobs:
10+
run:
11+
name: Run
12+
runs-on: ${{ matrix.operating-system }}
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
operating-system: [ubuntu-20.04]
17+
php-versions: ['7.4']
18+
env:
19+
extensions: xml, opcache, xdebug, pcov, grpc-1.30.0, protobuf-3.12.2
20+
key: cache-v3
21+
22+
steps:
23+
- name: Checkout
24+
uses: actions/checkout@v2
25+
- name: Setup PHP with extensions and custom config
26+
uses: shivammathur/setup-php@v2
27+
with:
28+
php-version: ${{ matrix.php-versions }}
29+
extensions: ${{ env.extensions }}
30+
ini-values: post_max_size=256M, short_open_tag=On, date.timezone=Asia/Shanghai
31+
tools: protoc, grpc_php_plugin
32+
- name: Testing PHP version
33+
run: |
34+
php -v
35+
php -r "if(strpos(phpversion(), '${{ matrix.php-versions }}') === false) {throw new Exception('Wrong PHP version Installed');}"
36+
- name: Test grpc_php_plugin and protoc
37+
run: |
38+
protoc --version
39+
cd php
40+
make generate

.github/workflows/pypi.yml

Lines changed: 42 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,31 @@ jobs:
88
strategy:
99
matrix:
1010
os: [ubuntu-latest]
11-
python-version: [3.7]
1211

1312
runs-on: ${{ matrix.os }}
1413
steps:
1514
- uses: actions/checkout@v2
1615
- name: Set up Python ${{ matrix.python-version }}
1716
uses: actions/setup-python@v1
1817
with:
19-
python-version: ${{ matrix.python-version }}
18+
python-version: 3.9
19+
- uses: actions/cache@master
20+
with:
21+
path: ~/.cache/pip
22+
key: ${{ runner.os }}-pip-${{ hashFiles('python/requirements.txt') }}
23+
restore-keys: |
24+
${{ runner.os }}-pip-
25+
26+
- name: Install Protoc
27+
uses: arduino/setup-protoc@master
28+
- name: Install Protoc 3rd party protos
29+
run: scripts/install-protoc.sh
30+
2031
- name: Install dependencies
2132
run: |
2233
cd python
2334
python -m pip install --upgrade pip
24-
pip install -r requirements.txt
25-
pip install -r requirements-dev.txt
35+
make install
2636
- name: Test
2737
run: |
2838
cd python
@@ -37,7 +47,19 @@ jobs:
3747
- uses: actions/checkout@v2
3848
- uses: actions/setup-python@v1
3949
with:
40-
python-version: 3.7
50+
python-version: 3.9
51+
- uses: actions/cache@master
52+
with:
53+
path: ~/.cache/pip
54+
key: ${{ runner.os }}-pip-${{ hashFiles('python/requirements.txt') }}
55+
restore-keys: |
56+
${{ runner.os }}-pip-
57+
58+
- name: Install Protoc
59+
uses: arduino/setup-protoc@master
60+
- name: Install Protoc 3rd party protos
61+
run: scripts/install-protoc.sh
62+
4163
- name: Install dependencies
4264
run: |
4365
cd python
@@ -61,12 +83,24 @@ jobs:
6183
- name: Set up Python
6284
uses: actions/setup-python@v1
6385
with:
64-
python-version: '3.7'
86+
python-version: '3.9'
87+
- uses: actions/cache@master
88+
with:
89+
path: ~/.cache/pip
90+
key: ${{ runner.os }}-pip-${{ hashFiles('python/requirements.txt') }}
91+
restore-keys: |
92+
${{ runner.os }}-pip-
93+
94+
- name: Install Protoc
95+
uses: arduino/setup-protoc@master
96+
- name: Install Protoc 3rd party protos
97+
run: scripts/install-protoc.sh
98+
6599
- name: Install dependencies
66100
run: |
67101
cd python
68102
python -m pip install --upgrade pip
69-
pip install setuptools wheel twine
103+
pip3 install setuptools wheel twine
70104
71105
- name: Check Branch
72106
id: check-branch
@@ -85,7 +119,7 @@ jobs:
85119
make install
86120
make generate
87121
make dist
88-
python setup.py sdist bdist_wheel
122+
python3 setup.py sdist bdist_wheel
89123
twine upload --skip-existing dist/*
90124
91125
- name: Is Not A Publish Branch

.gitignore

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,20 @@ t.*
7575

7676
.idea
7777
target/
78+
79+
# csharp
80+
*.nupkg
81+
.vs/
82+
*.suo
83+
*.user
84+
*.userosscache
85+
*.sln.docstates
86+
87+
csharp/Wechaty.Grpc/.vs/
88+
csharp/Wechaty.Grpc/proto
89+
csharp/Wechaty.Grpc/obj/
90+
csharp/Wechaty.Grpc/bin/
91+
csharp/Wechaty.Grpc/nupkg/package/
92+
csharp/Wechaty.Grpc/Properties
93+
94+
third-party/

0 commit comments

Comments
 (0)