Skip to content

Commit c802ffb

Browse files
authored
Merge branch 'apache:master' into master
2 parents b23a77a + d6e288b commit c802ffb

File tree

286 files changed

+12749
-2354
lines changed

Some content is hidden

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

286 files changed

+12749
-2354
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 10 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,17 +42,17 @@ jobs:
4542

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

5249
- name: Setup Go
53-
uses: actions/setup-go@v5
50+
uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
5451
with:
5552
go-version: "1.17"
5653

5754
- name: Cache deps
58-
uses: actions/cache@v4
55+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # 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@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # 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@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 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@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
4242
with:
4343
submodules: recursive
4444

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

.github/workflows/close-unresponded.yml

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

1919
steps:
2020
- name: Prune Stale
21-
uses: actions/stale@v8
21+
uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 # v8
2222
with:
2323
days-before-issue-stale: 60
2424
days-before-issue-close: 3

.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@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 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@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 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@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
2626
- name: 🚀 Use Node.js
27-
uses: actions/setup-node@v6.0.0
27+
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
2828
with:
2929
node-version: "12.x"
3030
- run: npm install -g markdownlint-cli@0.25.0
@@ -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@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
5353
with:
5454
submodules: recursive
5555
- name: Check Chinese copywriting
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: Docker Standalone Test
2+
3+
on:
4+
push:
5+
branches: [master, 'release/**']
6+
paths:
7+
- 'apisix/cli/ops.lua'
8+
- 'docker/debian-dev/**'
9+
- 't/cli/test_standalone_docker.sh'
10+
- 'Makefile'
11+
- '.github/workflows/docker-standalone.yml'
12+
pull_request:
13+
branches: [master, 'release/**']
14+
paths:
15+
- 'apisix/cli/ops.lua'
16+
- 'docker/debian-dev/**'
17+
- 't/cli/test_standalone_docker.sh'
18+
- 'Makefile'
19+
- '.github/workflows/docker-standalone.yml'
20+
21+
concurrency:
22+
group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.run_number || github.ref }}
23+
cancel-in-progress: true
24+
25+
permissions:
26+
contents: read
27+
28+
jobs:
29+
docker-test:
30+
runs-on: ubuntu-latest
31+
timeout-minutes: 30
32+
33+
steps:
34+
- name: Check out code
35+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
36+
37+
- name: Build APISIX Dashboard
38+
run: |
39+
# install node.js and pnpm
40+
sudo n lts
41+
corepack enable pnpm
42+
43+
# prepare apisix-dashboard source code
44+
source .requirements
45+
git clone --revision=${APISIX_DASHBOARD_COMMIT} --depth 1 https://github.com/apache/apisix-dashboard.git
46+
pushd apisix-dashboard
47+
48+
# compile
49+
pnpm install --frozen-lockfile
50+
pnpm run build
51+
popd
52+
53+
# copy the dist files to the ui directory
54+
mkdir ui
55+
cp -r apisix-dashboard/dist/* ui/
56+
rm -r apisix-dashboard
57+
58+
# build Docker image
59+
make build-on-debian-dev
60+
61+
- name: Run Docker standalone test
62+
run: |
63+
./t/cli/test_standalone_docker.sh

.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@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 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@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
3434
- name: Check License Header
35-
uses: apache/skywalking-eyes@v0.6.0
35+
uses: apache/skywalking-eyes@61275cc80d0798a405cb070f7d3a8aaf7cf2c2c1 # v0.8.0
3636
env:
3737
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/link-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: Checkout
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
3636

3737
- name: Get script
3838
run: |
3939
wget https://raw.githubusercontent.com/xuruidong/markdown-link-checker/main/link_checker.py
4040
4141
- name: Setup python
42-
uses: actions/setup-python@v6
42+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
4343
with:
4444
python-version: '3.9'
4545

0 commit comments

Comments
 (0)