Skip to content

Commit 19f642e

Browse files
bzp2010黄海婷Si-egekukiiuSkyeYoung
authored
feat: release 2.13.1 (#2653)
Co-authored-by: 黄海婷 <[email protected]> Co-authored-by: Zeping Bai <[email protected]> Co-authored-by: 张培国 <[email protected]> Co-authored-by: 洋洋 <[email protected]> Co-authored-by: Young <[email protected]> Co-authored-by: oil欧呦 <[email protected]> Co-authored-by: Morakes <[email protected]> Co-authored-by: 黄困困 <[email protected]> Co-authored-by: nthsky <[email protected]>
1 parent 7543860 commit 19f642e

File tree

144 files changed

+1018
-3374
lines changed

Some content is hidden

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

144 files changed

+1018
-3374
lines changed

‎.github/workflows/auto-build-rpm.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: Auto Build RPM
22

33
on:
44
push:
5-
branches: [master, 'release/**']
5+
branches: [master, 'release/2.13']
66
paths-ignore:
77
- 'docs/**'
88
pull_request:
9-
branches: [master]
9+
branches: [master, 'release/2.13']
1010
paths-ignore:
1111
- 'docs/**'
1212

‎.github/workflows/backend-cli-test.yml‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ name: Backend CLI Test
22

33
on:
44
push:
5-
branches:
6-
- master
5+
branches: [master, 'release/2.13']
76
paths:
87
- 'api/**'
98
pull_request:
10-
branches:
11-
- master
9+
branches: [master, 'release/2.13']
1210
paths:
1311
- 'api/**'
1412

@@ -17,21 +15,18 @@ jobs:
1715
runs-on: ubuntu-latest
1816
strategy:
1917
matrix:
20-
etcd: [3.4.14]
21-
services:
22-
etcd:
23-
image: bitnami/etcd:${{ matrix.etcd }}
24-
ports:
25-
- 2379:2379
26-
- 2380:2380
27-
env:
28-
ALLOW_NONE_AUTHENTICATION: yes
18+
etcd: [3.4.20]
2919

3020
steps:
3121
- uses: actions/checkout@v3
3222
with:
3323
submodules: recursive
3424

25+
- name: setup go
26+
uses: actions/setup-go@v3
27+
with:
28+
go-version: '1.19'
29+
3530
- name: cache etcd
3631
id: cache-etcd
3732
uses: actions/cache@v2

‎.github/workflows/backend-e2e-test.yml‎

Lines changed: 8 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ name: Backend E2E Test
22

33
on:
44
push:
5-
branches:
6-
- master
5+
branches: [master, 'release/2.13']
76
paths:
87
- 'api/**'
98
pull_request:
10-
branches:
11-
- master
9+
branches: [master, 'release/2.13']
1210
paths:
1311
- 'api/**'
1412

@@ -26,102 +24,11 @@ jobs:
2624
- name: setup go
2725
uses: actions/setup-go@v3
2826
with:
29-
go-version: "1.15"
30-
submodules: recursive
27+
go-version: "1.19"
3128

32-
- uses: actions/cache@v2
33-
with:
34-
path: |
35-
~/.cache/go-build
36-
~/go/pkg/mod
37-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
38-
restore-keys: |
39-
${{ runner.os }}-go-
40-
41-
- uses: docker/setup-buildx-action@v1
29+
- uses: docker/setup-buildx-action@v2
4230

43-
- uses: actions/cache@v2
44-
with:
45-
path: /tmp/.buildx-cache
46-
key: ${{ runner.os }}-buildx-apisixdashboard-${{ github.sha }}
47-
restore-keys: |
48-
${{ runner.os }}-buildx-apisixdashboard-
49-
${{ runner.os }}-buildx-
50-
51-
- name: Modify conf.yaml
52-
run: |
53-
sed -i 's/127.0.0.1:2379/172.16.238.10:2379/' ./api/conf/conf.yaml
54-
sed -i '[email protected]@0.0.0.0/0@' ./api/conf/conf.yaml
55-
sed -i '/172.16.238.10:2379/a\ - 172.16.238.11:2379' ./api/conf/conf.yaml
56-
sed -i '/172.16.238.10:2379/a\ - 172.16.238.12:2379' ./api/conf/conf.yaml
57-
sed -i 's@# - dubbo-proxy@- dubbo-proxy@' ./api/conf/conf.yaml
58-
59-
- name: download file Dockerfile-apisix
60-
working-directory: ./api/test/docker
61-
run: |
62-
curl -o Dockerfile-apisix https://raw.githubusercontent.com/apache/apisix-docker/master/alpine/Dockerfile
63-
64-
- name: build docker images
65-
working-directory: ./api/test/docker
66-
continue-on-error: true
67-
run: |
68-
docker buildx bake --load \
69-
-f docker-compose.yaml \
70-
--set *.cache-from=type=local,src=/tmp/.buildx-cache \
71-
--set *.cache-to=type=local,dest=/tmp/.buildx-cache
72-
73-
- name: build and start grpc_server_example
74-
working-directory: ./api/test/docker
75-
run: |
76-
wget https://github.com/api7/grpc_server_example/archive/refs/tags/20210819.tar.gz
77-
tar -xzvf 20210819.tar.gz && cd grpc_server_example-20210819
78-
docker build -t grpc_server_example:latest .
79-
80-
- name: run docker compose
81-
working-directory: ./api/test/docker
82-
run: |
83-
docker-compose up -d
84-
85-
# wait for services ready
86-
../shell/wait_for_services.sh
87-
88-
docker logs docker_managerapi_1
89-
docker logs docker_apisix_1
90-
91-
- name: run test
92-
working-directory: ./api/test/e2e
93-
run: go test -v
94-
95-
- name: stop docker compose
96-
working-directory: ./api/test/docker
97-
run: |
98-
docker-compose down
99-
sleep 10
100-
101-
- name: output test coverage
102-
working-directory: ./api/test/testdata
103-
run: |
104-
go tool cover -func=./integrationcover.out
105-
106-
- name: upload coverage profile
107-
working-directory: ./api/test/testdata
108-
run: |
109-
bash <(curl -s https://codecov.io/bash) -f ./integrationcover.out -F backend-e2e-test
110-
111-
backend-e2e-test-ginkgo:
112-
runs-on: ubuntu-latest
113-
114-
steps:
115-
- uses: actions/checkout@v3
116-
117-
- name: setup go
118-
uses: actions/setup-go@v3
119-
with:
120-
go-version: "1.17"
121-
122-
- uses: docker/setup-buildx-action@v1
123-
124-
- uses: actions/cache@v2
31+
- uses: actions/cache@v3
12532
with:
12633
path: /tmp/.buildx-cache
12734
key: ${{ runner.os }}-buildx-apisixdashboard-${{ github.sha }}
@@ -135,6 +42,8 @@ jobs:
13542
sed -i '[email protected]@0.0.0.0/0@' ./api/conf/conf.yaml
13643
sed -i '/172.16.238.10:2379/a\ - 172.16.238.11:2379' ./api/conf/conf.yaml
13744
sed -i '/172.16.238.10:2379/a\ - 172.16.238.12:2379' ./api/conf/conf.yaml
45+
sed -i '[email protected]/0:[email protected]:9000@' ./api/conf/conf.yaml
46+
13847
13948
- name: download file Dockerfile-apisix
14049
working-directory: ./api/test/docker
@@ -168,7 +77,7 @@ jobs:
16877
run: go install github.com/onsi/ginkgo/[email protected]
16978

17079
- name: run test
171-
working-directory: ./api/test/e2enew
80+
working-directory: ./api/test/e2e
17281
run: ginkgo -r
17382

17483
- name: stop docker compose

‎.github/workflows/backend-unit-test.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ name: Backend Unit Test
22

33
on:
44
push:
5-
branches:
6-
- master
5+
branches: [master, 'release/2.13']
76
paths:
87
- 'api/**'
98
pull_request:
10-
branches:
11-
- master
9+
branches: [master, 'release/2.13']
1210
paths:
1311
- 'api/**'
1412

@@ -31,7 +29,7 @@ jobs:
3129
- name: setup go
3230
uses: actions/setup-go@v3
3331
with:
34-
go-version: "1.15"
32+
go-version: "1.19"
3533

3634
- uses: actions/cache@v2
3735
with:

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches:
17-
- master
16+
branches: [master, 'release/2.13']
1817
paths-ignore:
1918
- 'docs/**'
2019
pull_request:
21-
branches:
22-
- master
20+
branches: [master, 'release/2.13']
2321
paths-ignore:
2422
- 'docs/**'
2523
schedule:

‎.github/workflows/deploy-with-docker.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ name: Test and Deploy with Docker
22

33
on:
44
push:
5-
branches:
6-
- master
5+
branches: [master, 'release/2.13']
76
paths-ignore:
87
- 'docs/**'
98
pull_request:
10-
branches:
11-
- master
9+
branches: [master, 'release/2.13']
1210
paths-ignore:
1311
- 'docs/**'
1412

‎.github/workflows/frontend-e2e-test.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ name: Frontend e2e test
22

33
on:
44
push:
5-
branches:
6-
- master
5+
branches: [master, 'release/2.13']
76
paths-ignore:
87
- 'docs/**'
98
pull_request:
10-
branches:
11-
- master
9+
branches: [master, 'release/2.13']
1210
paths-ignore:
1311
- 'docs/**'
1412

@@ -51,7 +49,7 @@ jobs:
5149
- name: Setup golang environment
5250
uses: actions/setup-go@v3
5351
with:
54-
go-version: '1.15'
52+
go-version: '1.19'
5553

5654
- uses: actions/cache@v2
5755
with:

‎.github/workflows/frontend-plugin-e2e-test.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
name: Frontend e2e test for plugin
22
on:
33
push:
4-
branches:
5-
- master
4+
branches: [master, 'release/2.13']
65
paths-ignore:
76
- 'docs/**'
87
pull_request:
9-
branches:
10-
- master
8+
branches: [master, 'release/2.13']
119
paths-ignore:
1210
- 'docs/**'
1311

@@ -49,7 +47,7 @@ jobs:
4947
- name: Setup golang environment
5048
uses: actions/setup-go@v3
5149
with:
52-
go-version: '1.15'
50+
go-version: '1.19'
5351

5452
- uses: actions/cache@v2
5553
with:

‎.github/workflows/gitleaks.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ name: gitLeaks
44

55
on:
66
push:
7-
branches:
8-
- master
7+
branches: [master, 'release/2.13']
98
paths-ignore:
109
- 'docs/**'
1110
pull_request:
12-
branches:
13-
- master
11+
branches: [master, 'release/2.13']
1412
paths-ignore:
1513
- 'docs/**'
1614

‎.github/workflows/go-lint.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
name: go-lint
22
on:
33
push:
4-
branches:
5-
- master
4+
branches: [master, 'release/2.13']
65
paths:
76
- 'api/**'
87
pull_request:
9-
branches:
10-
- master
8+
branches: [master, 'release/2.13']
119
paths:
1210
- 'api/**'
1311

@@ -33,7 +31,7 @@ jobs:
3331
- name: setup go
3432
uses: actions/setup-go@v3
3533
with:
36-
go-version: '1.15'
34+
go-version: '1.19'
3735

3836
- uses: actions/cache@v2
3937
with:

0 commit comments

Comments
 (0)