Skip to content

Commit cebc2a1

Browse files
DustinWinDustinWin
committed
新增 mihomo 内核分享教程中的策略组类型；新增删除旧 workflows 的配置
1 parent 0f3fd56 commit cebc2a1

7 files changed

+176
-3
lines changed

‎.github/workflows/delete-old-workflows.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Delete old workflows
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
- cron: "0 22 * * *"
6+
7+
jobs:
8+
del_runs:
9+
runs-on: ubuntu-latest
10+
permissions:
11+
actions: write
12+
steps:
13+
- name: Delete old workflow runs
14+
uses: Mattraks/delete-workflow-runs@v2
15+
with:
16+
token: ${{ github.token }}
17+
repository: ${{ github.repository }}
18+
delete_workflow_pattern:
19+
- "Dependabot Updates"
20+
- "Delete old workflows"
21+
retain_days: 3
22+
keep_minimum_runs: 1

‎.github/workflows/pages-deploy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v5
3030
with:
3131
fetch-depth: 0
3232
submodules: true
@@ -53,7 +53,7 @@ jobs:
5353
\-\-ignore-urls "/^http:/"
5454
5555
- name: Upload site artifact
56-
uses: actions/upload-pages-artifact@v3
56+
uses: actions/upload-pages-artifact@v4
5757
with:
5858
path: "_site${{ steps.pages.outputs.base_path }}"
5959

‎_posts/2024-08-21-share-android-mihomo-ruleset.md‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,36 @@ rules:
266266
- MATCH,漏网之鱼
267267
```
268268
269-
------
269+
---
270+
271+
>`proxy-groups` 私货
272+
{: .prompt-tip }
273+
274+
注：
275+
- 1. 本 `proxy-groups` 配置中，将不同的节点类型（如：`Shadowsocks` 和 `Trojan`）分别配置 `type: url-test` 进行延迟测试
276+
- 2. 再将上述延迟测试最低的策略组配置 `type: fallback` 进行自动回退
277+
278+
```yaml
279+
proxy-groups:
280+
- {name: 香港节点, type: fallback, proxies: ["香港节点-ss", "香港节点-trojan"], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/hongkong.png"}
281+
- {name: 香港节点-ss, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇭🇰|港|hk|hongkong|hong kong)", exclude-type: "Trojan", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/hongkong.png"}
282+
- {name: 香港节点-trojan, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇭🇰|港|hk|hongkong|hong kong)", exclude-type: "Shadowsocks", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/hongkong.png"}
283+
- {name: 台湾节点, type: fallback, proxies: ["台湾节点-ss", "台湾节点-trojan"], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/taiwan.png"}
284+
- {name: 台湾节点-ss, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇹🇼|台|tw|taiwan|tai wan)", exclude-type: "Trojan", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/taiwan.png"}
285+
- {name: 台湾节点-trojan, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇹🇼|台|tw|taiwan|tai wan)", exclude-type: "Shadowsocks", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/taiwan.png"}
286+
- {name: 日本节点, type: fallback, proxies: ["日本节点-ss", "日本节点-trojan"], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/japan.png"}
287+
- {name: 日本节点-ss, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇯🇵|日|jp|japan)", exclude-type: "Trojan", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/japan.png"}
288+
- {name: 日本节点-trojan, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇯🇵|日|jp|japan)", exclude-type: "Shadowsocks", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/japan.png"}
289+
- {name: 新加坡节点, type: fallback, proxies: ["新加坡节点-ss", "新加坡节点-trojan"], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/singapore.png"}
290+
- {name: 新加坡节点-ss, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇸🇬|新|sg|singapore)", exclude-type: "Trojan", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/singapore.png"}
291+
- {name: 新加坡节点-trojan, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇸🇬|新|sg|singapore)", exclude-type: "Shadowsocks", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/singapore.png"}
292+
- {name: 美国节点, type: fallback, proxies: ["美国节点-ss", "美国节点-trojan"], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/unitedstates.png"}
293+
- {name: 美国节点-ss, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇺🇸|美|us|unitedstates|united states)", exclude-type: "Trojan", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/unitedstates.png"}
294+
- {name: 美国节点-trojan, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇺🇸|美|us|unitedstates|united states)", exclude-type: "Shadowsocks", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/unitedstates.png"}
295+
- {name: 免费节点, type: url-test, tolerance: 50, use: [🆓 免费订阅], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/free.png"}
296+
```
297+
298+
---
270299

271300
>`DNS` 私货
272301
{: .prompt-tip }

‎_posts/2024-08-21-share-shellcrash-mihomo-geodata.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,37 @@ rules:
103103
- MATCH,漏网之鱼
104104
```
105105
106+
---
107+
108+
>`proxy-groups` 私货
109+
{: .prompt-tip }
110+
111+
注：
112+
- 1. 本 `proxy-groups` 配置中，将不同的节点类型（如：`Shadowsocks` 和 `Trojan`）分别配置 `type: url-test` 进行延迟测试
113+
- 2. 再将上述延迟测试最低的策略组配置 `type: fallback` 进行自动回退
114+
115+
```yaml
116+
proxy-groups:
117+
- {name: 香港节点, type: fallback, proxies: ["香港节点-ss", "香港节点-trojan"], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/hongkong.png"}
118+
- {name: 香港节点-ss, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇭🇰|港|hk|hongkong|hong kong)", exclude-type: "Trojan", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/hongkong.png"}
119+
- {name: 香港节点-trojan, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇭🇰|港|hk|hongkong|hong kong)", exclude-type: "Shadowsocks", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/hongkong.png"}
120+
- {name: 台湾节点, type: fallback, proxies: ["台湾节点-ss", "台湾节点-trojan"], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/taiwan.png"}
121+
- {name: 台湾节点-ss, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇹🇼|台|tw|taiwan|tai wan)", exclude-type: "Trojan", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/taiwan.png"}
122+
- {name: 台湾节点-trojan, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇹🇼|台|tw|taiwan|tai wan)", exclude-type: "Shadowsocks", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/taiwan.png"}
123+
- {name: 日本节点, type: fallback, proxies: ["日本节点-ss", "日本节点-trojan"], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/japan.png"}
124+
- {name: 日本节点-ss, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇯🇵|日|jp|japan)", exclude-type: "Trojan", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/japan.png"}
125+
- {name: 日本节点-trojan, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇯🇵|日|jp|japan)", exclude-type: "Shadowsocks", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/japan.png"}
126+
- {name: 新加坡节点, type: fallback, proxies: ["新加坡节点-ss", "新加坡节点-trojan"], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/singapore.png"}
127+
- {name: 新加坡节点-ss, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇸🇬|新|sg|singapore)", exclude-type: "Trojan", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/singapore.png"}
128+
- {name: 新加坡节点-trojan, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇸🇬|新|sg|singapore)", exclude-type: "Shadowsocks", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/singapore.png"}
129+
- {name: 美国节点, type: fallback, proxies: ["美国节点-ss", "美国节点-trojan"], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/unitedstates.png"}
130+
- {name: 美国节点-ss, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇺🇸|美|us|unitedstates|united states)", exclude-type: "Trojan", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/unitedstates.png"}
131+
- {name: 美国节点-trojan, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇺🇸|美|us|unitedstates|united states)", exclude-type: "Shadowsocks", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/unitedstates.png"}
132+
- {name: 免费节点, type: url-test, tolerance: 50, use: [🆓 免费订阅], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/free.png"}
133+
```
134+
135+
---
136+
106137
## 二、 导入 [mihomo 内核](https://github.com/MetaCubeX/mihomo)和 [zashboard 面板](https://github.com/Zephyruso/zashboard)
107138
连接 SSH 后执行如下命令：
108139

‎_posts/2024-08-21-share-shellcrash-mihomo-ruleset.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,37 @@ rules:
215215
- MATCH,漏网之鱼
216216
```
217217
218+
---
219+
220+
>`proxy-groups` 私货
221+
{: .prompt-tip }
222+
223+
注：
224+
- 1. 本 `proxy-groups` 配置中，将不同的节点类型（如：`Shadowsocks` 和 `Trojan`）分别配置 `type: url-test` 进行延迟测试
225+
- 2. 再将上述延迟测试最低的策略组配置 `type: fallback` 进行自动回退
226+
227+
```yaml
228+
proxy-groups:
229+
- {name: 香港节点, type: fallback, proxies: ["香港节点-ss", "香港节点-trojan"], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/hongkong.png"}
230+
- {name: 香港节点-ss, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇭🇰|港|hk|hongkong|hong kong)", exclude-type: "Trojan", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/hongkong.png"}
231+
- {name: 香港节点-trojan, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇭🇰|港|hk|hongkong|hong kong)", exclude-type: "Shadowsocks", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/hongkong.png"}
232+
- {name: 台湾节点, type: fallback, proxies: ["台湾节点-ss", "台湾节点-trojan"], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/taiwan.png"}
233+
- {name: 台湾节点-ss, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇹🇼|台|tw|taiwan|tai wan)", exclude-type: "Trojan", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/taiwan.png"}
234+
- {name: 台湾节点-trojan, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇹🇼|台|tw|taiwan|tai wan)", exclude-type: "Shadowsocks", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/taiwan.png"}
235+
- {name: 日本节点, type: fallback, proxies: ["日本节点-ss", "日本节点-trojan"], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/japan.png"}
236+
- {name: 日本节点-ss, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇯🇵|日|jp|japan)", exclude-type: "Trojan", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/japan.png"}
237+
- {name: 日本节点-trojan, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇯🇵|日|jp|japan)", exclude-type: "Shadowsocks", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/japan.png"}
238+
- {name: 新加坡节点, type: fallback, proxies: ["新加坡节点-ss", "新加坡节点-trojan"], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/singapore.png"}
239+
- {name: 新加坡节点-ss, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇸🇬|新|sg|singapore)", exclude-type: "Trojan", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/singapore.png"}
240+
- {name: 新加坡节点-trojan, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇸🇬|新|sg|singapore)", exclude-type: "Shadowsocks", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/singapore.png"}
241+
- {name: 美国节点, type: fallback, proxies: ["美国节点-ss", "美国节点-trojan"], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/unitedstates.png"}
242+
- {name: 美国节点-ss, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇺🇸|美|us|unitedstates|united states)", exclude-type: "Trojan", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/unitedstates.png"}
243+
- {name: 美国节点-trojan, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇺🇸|美|us|unitedstates|united states)", exclude-type: "Shadowsocks", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/unitedstates.png"}
244+
- {name: 免费节点, type: url-test, tolerance: 50, use: [🆓 免费订阅], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/free.png"}
245+
```
246+
247+
---
248+
218249
## 二、 导入 [mihomo 内核](https://github.com/MetaCubeX/mihomo)和 [zashboard 面板](https://github.com/Zephyruso/zashboard)
219250
连接 SSH 后执行如下命令：
220251

‎_posts/2024-08-21-share-shellcrashadguardhome-mihomo-ruleset.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,37 @@ rules:
213213
- MATCH,漏网之鱼
214214
```
215215
216+
---
217+
218+
>`proxy-groups` 私货
219+
{: .prompt-tip }
220+
221+
注：
222+
- 1. 本 `proxy-groups` 配置中，将不同的节点类型（如：`Shadowsocks` 和 `Trojan`）分别配置 `type: url-test` 进行延迟测试
223+
- 2. 再将上述延迟测试最低的策略组配置 `type: fallback` 进行自动回退
224+
225+
```yaml
226+
proxy-groups:
227+
- {name: 香港节点, type: fallback, proxies: ["香港节点-ss", "香港节点-trojan"], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/hongkong.png"}
228+
- {name: 香港节点-ss, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇭🇰|港|hk|hongkong|hong kong)", exclude-type: "Trojan", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/hongkong.png"}
229+
- {name: 香港节点-trojan, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇭🇰|港|hk|hongkong|hong kong)", exclude-type: "Shadowsocks", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/hongkong.png"}
230+
- {name: 台湾节点, type: fallback, proxies: ["台湾节点-ss", "台湾节点-trojan"], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/taiwan.png"}
231+
- {name: 台湾节点-ss, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇹🇼|台|tw|taiwan|tai wan)", exclude-type: "Trojan", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/taiwan.png"}
232+
- {name: 台湾节点-trojan, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇹🇼|台|tw|taiwan|tai wan)", exclude-type: "Shadowsocks", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/taiwan.png"}
233+
- {name: 日本节点, type: fallback, proxies: ["日本节点-ss", "日本节点-trojan"], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/japan.png"}
234+
- {name: 日本节点-ss, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇯🇵|日|jp|japan)", exclude-type: "Trojan", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/japan.png"}
235+
- {name: 日本节点-trojan, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇯🇵|日|jp|japan)", exclude-type: "Shadowsocks", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/japan.png"}
236+
- {name: 新加坡节点, type: fallback, proxies: ["新加坡节点-ss", "新加坡节点-trojan"], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/singapore.png"}
237+
- {name: 新加坡节点-ss, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇸🇬|新|sg|singapore)", exclude-type: "Trojan", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/singapore.png"}
238+
- {name: 新加坡节点-trojan, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇸🇬|新|sg|singapore)", exclude-type: "Shadowsocks", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/singapore.png"}
239+
- {name: 美国节点, type: fallback, proxies: ["美国节点-ss", "美国节点-trojan"], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/unitedstates.png"}
240+
- {name: 美国节点-ss, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇺🇸|美|us|unitedstates|united states)", exclude-type: "Trojan", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/unitedstates.png"}
241+
- {name: 美国节点-trojan, type: url-test, tolerance: 50, use: [🛫 机场订阅], filter: "(?i)(🇺🇸|美|us|unitedstates|united states)", exclude-type: "Shadowsocks", hidden: true, icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/unitedstates.png"}
242+
- {name: 免费节点, type: url-test, tolerance: 50, use: [🆓 免费订阅], icon: "https://github.com/DustinWin/ruleset_geodata/releases/download/icons/free.png"}
243+
```
244+
245+
---
246+
216247
## 二、 导入 [mihomo 内核](https://github.com/MetaCubeX/mihomo)、[zashboard 面板](https://github.com/Zephyruso/zashboard)和 CN_IP 文件
217248
连接 SSH 后执行如下命令：
218249

0 commit comments

Comments
 (0)