Skip to content

Commit 0559a62

Browse files
committed
Merge upstream/master into feat/sh-path-extend
2 parents c7e73cb + 06f0fbc commit 0559a62

File tree

235 files changed

+9051
-2048
lines changed

Some content is hidden

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

235 files changed

+9051
-2048
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,9 @@ jobs:
2828
- ubuntu-latest
2929
os_name:
3030
- linux_openresty
31-
events_module:
32-
- lua-resty-worker-events
33-
- lua-resty-events
3431
test_dir:
35-
- t/plugin/[a-k]*
36-
- t/plugin/[l-z]*
32+
- t/plugin/[a-k]*.t
33+
- t/stream-plugin t/plugin/[l-z]*.t
3734
- t/admin t/cli t/config-center-yaml t/control t/core t/debug t/discovery t/error_page t/http3/admin t/misc
3835
- t/node t/pubsub t/router t/script t/secret t/stream-node t/utils t/wasm t/xds-library t/xrpc
3936

@@ -45,7 +42,7 @@ jobs:
4542

4643
steps:
4744
- name: Check out code
48-
uses: actions/checkout@v4
45+
uses: actions/checkout@v5
4946
with:
5047
submodules: recursive
5148

@@ -55,7 +52,7 @@ jobs:
5552
go-version: "1.17"
5653

5754
- name: Cache deps
58-
uses: actions/cache@v4
55+
uses: actions/cache@v5
5956
env:
6057
cache-name: cache-deps
6158
with:
@@ -81,6 +78,10 @@ jobs:
8178
run: |
8279
bash ./ci/free_disk_space.sh
8380
81+
- name: Set hostname
82+
run: |
83+
sudo sh -c 'echo "127.0.1.1 httpbin.local" >> /etc/hosts'
84+
8485
- name: Linux Before install
8586
run: sudo ./ci/${{ matrix.os_name }}_runner.sh before_install
8687

@@ -96,7 +97,7 @@ jobs:
9697
9798
- name: Cache images
9899
id: cache-images
99-
uses: actions/cache@v4
100+
uses: actions/cache@v5
100101
env:
101102
cache-name: cache-apisix-docker-images
102103
with:
@@ -166,7 +167,6 @@ jobs:
166167
- name: Linux Script
167168
env:
168169
TEST_FILE_SUB_DIR: ${{ matrix.test_dir }}
169-
TEST_EVENTS_MODULE: ${{ matrix.events_module }}
170170
run: sudo -E ./ci/${{ matrix.os_name }}_runner.sh script
171171

172172
- if: ${{ steps.cache-images.outputs.cache-hit != 'true' }}

.github/workflows/check-changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
check-changelog:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v5
1818
with:
1919
fetch-depth: 0
2020

.github/workflows/cli.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ jobs:
3838

3939
steps:
4040
- name: Check out code
41-
uses: actions/checkout@v4
41+
uses: actions/checkout@v5
4242
with:
4343
submodules: recursive
4444

4545
- name: Cache deps
46-
uses: actions/cache@v4
46+
uses: actions/cache@v5
4747
env:
4848
cache-name: cache-deps
4949
with:

.github/workflows/code-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
timeout-minutes: 10
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919
- name: Install
2020
run: |
2121
. ./ci/common.sh
@@ -37,7 +37,7 @@ jobs:
3737
timeout-minutes: 5
3838
steps:
3939
- name: Checkout code
40-
uses: actions/checkout@v4
40+
uses: actions/checkout@v5
4141

4242
- name: Shellcheck code
4343
run: |

.github/workflows/doc-lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
runs-on: ubuntu-latest
2323
timeout-minutes: 1
2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626
- name: 🚀 Use Node.js
27-
uses: actions/setup-node@v6.0.0
27+
uses: actions/setup-node@v6.2.0
2828
with:
2929
node-version: "12.x"
3030
- run: npm install -g [email protected]
@@ -49,7 +49,7 @@ jobs:
4949
runs-on: ubuntu-latest
5050
timeout-minutes: 1
5151
steps:
52-
- uses: actions/checkout@v4
52+
- uses: actions/checkout@v5
5353
with:
5454
submodules: recursive
5555
- name: Check Chinese copywriting

.github/workflows/kubernetes-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
steps:
3939
- name: Check out code
40-
uses: actions/checkout@v4
40+
uses: actions/checkout@v5
4141
with:
4242
submodules: recursive
4343

.github/workflows/license-checker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ jobs:
3030
timeout-minutes: 3
3131

3232
steps:
33-
- uses: actions/checkout@v4
33+
- uses: actions/checkout@v5
3434
- name: Check License Header
35-
uses: apache/skywalking-eyes@v0.6.0
35+
uses: apache/skywalking-eyes@v0.8.0
3636
env:
3737
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/link-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: Checkout
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@v5
3636

3737
- name: Get script
3838
run: |

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Check out code.
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515
- name: spell check
1616
run: |
1717
pip install codespell==2.1.0
@@ -30,10 +30,10 @@ jobs:
3030

3131
steps:
3232
- name: Check out code
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v5
3434

3535
- name: Setup Nodejs env
36-
uses: actions/setup-node@v6.0.0
36+
uses: actions/setup-node@v6.2.0
3737
with:
3838
node-version: '12'
3939

.github/workflows/push-dev-image-on-commit.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
steps:
3232
- name: Check out the repo
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v5
3434

3535
- name: Build APISIX Dashboard
3636
run: |
@@ -68,7 +68,7 @@ jobs:
6868
"uri": "/get",
6969
"upstream": {
7070
"type": "roundrobin",
71-
"nodes": { "httpbin.org:80": 1 }
71+
"nodes": { "httpbin:8080": 1 }
7272
}
7373
}'
7474
@@ -102,7 +102,7 @@ jobs:
102102
password: ${{ secrets.DOCKERHUB_TOKEN }}
103103

104104
- name: Check out the repo
105-
uses: actions/checkout@v4
105+
uses: actions/checkout@v5
106106

107107
- name: Merge architecture-specific tags
108108
run: |

0 commit comments

Comments
 (0)