Skip to content

Commit f490959

Browse files
authored
Merge pull request #3288 from emqx/20251222-sync-release-6.0
sync release-6.0
2 parents 9a7867f + b050260 commit f490959

File tree

244 files changed

+12194
-7728
lines changed

Some content is hidden

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

244 files changed

+12194
-7728
lines changed

.github/workflows/auto-translate-issues.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
translate:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: emqx/translate-issue-action@59470e9ed84de890a81a4a3ac10d0a45a2ed5d03 # v1.0.3
20+
- uses: emqx/translate-issue-action@ac780c33a803ed87b694108fd709e4251569ec8c # v1.0.5
2121
with:
2222
issue_number: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.issue_number || github.event.issue.number }}
2323
gemini_api_key: ${{ secrets.GEMINI_API_KEY }}

.github/workflows/check_markdown.yaml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
name: Check Docs
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- 'release-[0-9].[0-9]'
7+
- 'release-[0-9].[0-9][0-9]'
8+
pull_request:
9+
branches:
10+
- 'release-[0-9].[0-9]'
11+
- 'release-[0-9].[0-9][0-9]'
412

513
jobs:
614
markdown_check:
715
runs-on: ubuntu-latest
816
steps:
917
- name: check out code
10-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
18+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
1119

1220
- name: check markdown
1321
run: |
@@ -16,11 +24,14 @@ jobs:
1624
markdownlint -c .github/workflows/markdown_config.json ./zh_CN
1725
markdownlint -c .github/workflows/markdown_config.json ./ja_JP
1826
27+
- name: Spell Check Repo
28+
uses: crate-ci/[email protected]
29+
1930
directory_check:
2031
runs-on: ubuntu-latest
2132
steps:
2233
- name: check out code
23-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
34+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2435

2536
- name: check directory config
2637
run: |

.github/workflows/deploy_docs.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
tags:
66
- v*
77
pull_request:
8+
branches:
9+
- 'release-[0-9].[0-9]'
10+
- 'release-[0-9].[0-9][0-9]'
811

912
jobs:
1013
prepare:
@@ -13,7 +16,7 @@ jobs:
1316
versions: ${{ steps.set_environment.outputs.versions }}
1417
docs_types: ${{ steps.set_environment.outputs.docs_types }}
1518
steps:
16-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
19+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
1720
with:
1821
fetch-depth: 0
1922

@@ -52,7 +55,7 @@ jobs:
5255
runs-on: ubuntu-latest
5356
steps:
5457
- name: clone docs
55-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
58+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5659
with:
5760
fetch-depth: 0
5861
path: docs-files
@@ -72,7 +75,7 @@ jobs:
7275
owner: ${{ github.repository_owner }}
7376

7477
- name: clone frontend
75-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
78+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
7679
with:
7780
repository: 'emqx/docs-emqx-com-frontend'
7881
ref: next
@@ -204,7 +207,7 @@ jobs:
204207
205208
- name: set aws credentials
206209
if: github.event_name == 'push'
207-
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a # v4.3.1
210+
uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 # v5.1.1
208211
with:
209212
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
210213
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/openhands-resolver.yaml

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

4545
steps:
4646
- name: Checkout repository
47-
uses: actions/checkout@v4
47+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4848
with:
4949
repository: All-Hands-AI/OpenHands
5050
ref: 0.39.1
@@ -67,7 +67,7 @@ jobs:
6767
cat /tmp/requirements.txt
6868
6969
- name: Cache pip dependencies
70-
uses: actions/cache@v4
70+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
7171
with:
7272
path: ${{ env.pythonLocation }}/lib/python3.12/site-packages/*
7373
key: ${{ runner.os }}-pip-openhands-resolver-${{ hashFiles('/tmp/requirements.txt') }}
@@ -123,7 +123,7 @@ jobs:
123123
fi
124124
125125
- name: Upload output.jsonl as artifact
126-
uses: actions/upload-artifact@v4
126+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
127127
if: always() # Upload even if the previous steps fail
128128
with:
129129
name: resolver-output

.github/workflows/pr-checks.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ name: PR Checks
22

33
on:
44
pull_request:
5-
5+
branches:
6+
- 'release-[0-9].[0-9]'
7+
- 'release-[0-9].[0-9][0-9]'
68
jobs:
79
pr-checks:
810
runs-on: ubuntu-latest

.github/workflows/translate_to_ja.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
owner: ${{ github.repository_owner }}
4343

4444
- name: Checkout repository
45-
uses: actions/checkout@v4
45+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4646
with:
4747
token: ${{ steps.app-token.outputs.token }}
4848
fetch-depth: 0

.github/workflows/update-api-and-cfg-manual.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
pull-requests: write
3434

3535
steps:
36-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
36+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3737

3838
- name: Generate GitHub App token
3939
id: app-token
@@ -45,7 +45,7 @@ jobs:
4545
repositories: |
4646
emqx
4747
48-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
48+
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
4949
with:
5050
pattern: "emqx*-schema-dump"
5151
repository: "emqx/emqx"
@@ -91,7 +91,7 @@ jobs:
9191
done
9292
gh pr create --title "update api docs and configuration manual for ${VERSION}" --body '' --base ${BASE_BRANCH} --head ${NEW_BRANCH} --label update-api-cfg --repo ${{ github.repository }}
9393
94-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
94+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
9595
with:
9696
name: "swagger"
9797
path: |

.github/workflows/update-changelog.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
pull-requests: write
3131

3232
steps:
33-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
33+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3434

3535
- name: Generate GitHub App token
3636
id: app-token
@@ -40,7 +40,7 @@ jobs:
4040
private-key: ${{ secrets.AUTH_APP_PRIVATE_KEY }}
4141
owner: ${{ github.repository_owner }}
4242

43-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
43+
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
4444
with:
4545
name: changes
4646
repository: emqx/emqx

_typos.toml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
[default]
2+
extend-ignore-re = [
3+
"[A-Fa-f0-9]{8,}", # hexadecimal tokens
4+
"[A-Za-z0-9+/=]{12,}", # base64-like random blobs
5+
"([A-Z0-9]{2,}-){2,}[A-Z0-9]+", # cipher suites (PSK-3DES-EDE-CBC-SHA)
6+
"([A-Za-z]{2,}_){1,}[A-Za-z]+" # snake_case config fields (may contain abbreviations)
7+
]
8+
extend-ignore-words-re = ["^custome$"]
9+
10+
[default.extend-words]
11+
# EMQX specific terms
12+
emqx = "emqx"
13+
kuiper = "kuiper"
14+
neuron = "neuron"
15+
mqtt = "mqtt"
16+
suback = "suback"
17+
puback = "puback"
18+
qos = "qos"
19+
mosquitto = "mosquitto"
20+
alis = "alis"
21+
wxs = "wxs"
22+
23+
# Technical jargon
24+
k8s = "k8s"
25+
auth = "auth"
26+
repo = "repo"
27+
schemas = "schemas"
28+
29+
# Ordinal numbers
30+
1st = "1st"
31+
2nd = "2nd"
32+
3rd = "3rd"
33+
34+
# Words that appeared in false positives
35+
succee = "succee"
36+
smal = "smal"
37+
siz = "siz"
38+
iif = "iif"
39+
EACG = "EACG"
40+
EDE = "EDE"
41+
HPE = "HPE"
42+
AKS = "AKS"
43+
aks = "aks"
44+
TKE = "TKE"
45+
Sur = "Sur"
46+
47+
[default.extend-identifiers]
48+
iif = "iif"
49+
50+
[files]
51+
extend-exclude = ["redocly", "cfg-manual-docgen", "hocon"]

current-version.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
EE_VERSION=6.0.1
2-
CE_VERSION=5.9.0
2+
CE_VERSION=5.8.8
33
EE_MINOR_VERSION=6.0
4-
CE_MINOR_VERSION=5.9
4+
CE_MINOR_VERSION=5.8

0 commit comments

Comments
 (0)