Skip to content

fix: adapt to new convention #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fumiama merged 5 commits into from
Mar 14, 2026
+131 −125
Merged

fix: adapt to new convention #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2654a3
feat: test mod pr
fumiama Mar 14, 2026
407f284
fix: adapt to new convention
fumiama Mar 14, 2026
e26d743
fix: adapt to new convention
fumiama Mar 14, 2026
861b0c6
fix: adapt to new convention
fumiama Mar 14, 2026
443fa9d
fix(ci): build check
fumiama Mar 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions .github/workflows/nightly.yml → .github/workflows/lib_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
name: 最新版
name: Build

on:
workflow_run:
workflows: [PushLint, PullLint]
types:
- completed
workflow_call:
inputs:
prefix:
type: string
required: true
upload_artifact:
type: boolean
required: true

env:
BINARY_PREFIX: "zbppg_"
BINARY_SUFFIX: ""
BINARY_SUFFIX: "${{ inputs.prefix }}"
PR_PROMPT: "::warning:: Build artifact will not be uploaded due to the workflow is trigged by pull request."
LD_FLAGS: "-w -s"

jobs:
build:
name: Build binary CI
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'success' }}
strategy:
matrix:
# build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/amd64, darwin/arm64
Expand All @@ -34,10 +36,12 @@ jobs:
- uses: actions/checkout@master
with:
fetch-depth: 0

- name: Setup Go environment
uses: actions/setup-go@master
with:
go-version: '^1.25'

- name: Cache downloaded module
uses: actions/cache@master
continue-on-error: true
Expand All @@ -46,21 +50,25 @@ jobs:
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-go-${{ matrix.goos }}-${{ matrix.goarch }}-${{ hashFiles('**/go.sum') }}

- name: Build binary file
env:
GOOS: ${{ matrix.goos }}
GOARCH: ${{ matrix.goarch }}
IS_PR: ${{ !!github.head_ref }}
IS_PR: ${{ !inputs.upload_artifact }}
BINARY_PREFIX: ${{ inputs.BINARY_PREFIX }}
run: |
GOOS= GOARCH= go generate ./...
if [ $GOOS = "windows" ]; then export BINARY_SUFFIX="$BINARY_SUFFIX.exe"; fi
if $IS_PR ; then echo $PR_PROMPT; fi
export BINARY_NAME="$BINARY_PREFIX$GOOS_$GOARCH$BINARY_SUFFIX"
export CGO_ENABLED=0
go generate main.go
go build -o "output/$BINARY_NAME" -trimpath -ldflags "$LD_FLAGS" .

- name: Upload artifact
uses: actions/upload-artifact@master
if: ${{ !github.head_ref }}
if: ${{ inputs.upload_artifact }}
with:
name: ${{ matrix.goos }}_${{ matrix.goarch }}
path: output/
7 changes: 7 additions & 0 deletions .github/workflows/pull.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,10 @@ jobs:
uses: ./.github/workflows/lib_run.yml
with:
ref: ${{ github.event.pull_request.head.sha }}

build:
needs: [runmain]
uses: ./.github/workflows/lib_build.yml
with:
prefix: "zbppg_"
upload_artifact: false
7 changes: 7 additions & 0 deletions .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,10 @@ jobs:
uses: ./.github/workflows/lib_run.yml
with:
ref: main

build:
needs: [runmain]
uses: ./.github/workflows/lib_build.yml
with:
prefix: "zbppg_"
upload_artifact: true
80 changes: 0 additions & 80 deletions README-Edit.md
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
## 完善教程
目前开发教程还不是很全面，欢迎大家编辑此README完善它，让更多人轻松加入zbp大家庭！

目前提供的样板有 example 中的
目前提供的教程有

- [江林版本](example/JiangRed/message.go)
- [小锅饭版本](example/xiaoguofan/example.go)
- [江林版本](plugin/exJiangRed/message.go)
- [小锅饭版本](plugin/exXiaoGuoFan/example.go)
- [小锅饭的ZerobotCourse](https://github.com/guohuiyuan/ZerobotCourse)
- [夹子的版本(半成品)](doc)
4 changes: 2 additions & 2 deletions abineundo/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ const (

var (
priore = regexp.MustCompile(`^\t// -{28}(高|中|低)优先级区-{28} //$`)
mainpluginre = regexp.MustCompile(`^\t_ "github\.com/FloatTech/ZeroBot-Plugin/plugin/(\w+)"\s+// `)
custpluginre = regexp.MustCompile(`^\t_ "github\.com/FloatTech/ZeroBot-Plugin/custom/plugin/(\w+)"\s+// `)
mainpluginre = regexp.MustCompile(`^\t_ "github\.com/FloatTech/ZeroBot-Plugin-Playground/plugin/(\w+)"\s+// `)
custpluginre = regexp.MustCompile(`^\t_ "github\.com/FloatTech/ZeroBot-Plugin-Playground/custom/plugin/(\w+)"\s+// `)
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion doc/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@
## 引用

- [ZerobotCourse](https://github.com/guohuiyuan/ZerobotCourse)
- [example/JiangRed](example/JiangRed/message.go)
- [plugin/exJiangRed](plugin/exJiangRed/message.go)
- [khl.py](https://github.com/TWT233/khl.py)
122 changes: 93 additions & 29 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,37 +19,101 @@ import (

_ "github.com/FloatTech/ZeroBot-Plugin-Playground/abineundo" // 设置插件优先级&更改控制台属性

_ "github.com/FloatTech/ZeroBot-Plugin-Playground/example/JiangRed"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/example/xiaoguofan"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/anotherfortune"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/chatgpt"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/chinesebqb"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/cybercat"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/draw" // 服务详情
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/fadian"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/fgopickup"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/fyzhq"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/games"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/klala" // 星穹铁道面板/图鉴插件
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/kokomi"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/moegozh"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/movies"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/ottoshout"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/partygame"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/playwright"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/qqci"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/qqclean"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/recall" // SGK2401
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/rsshub"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/slash"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/subweibo"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/tgyj"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/vote"
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/youdaotranslate"

// 程序主体
// ---------以下插件均可通过前面加 // 注释，注释后停用并不加载插件--------- //
// ----------------------插件优先级按顺序从高到低---------------------- //
// //
// //
// //
// //
// //
// ----------------------------高优先级区---------------------------- //
// vvvvvvvvvvvvvvvvvvvvvvvvvvvv高优先级区vvvvvvvvvvvvvvvvvvvvvvvvvvvv //
// vvvvvvvvvvvvvv高优先级区vvvvvvvvvvvvvv //
// vvvvvvv高优先级区vvvvvvv //
// vvvvvvvvvvvvvv //
// vvvv //

// ^^^^ //
// ^^^^^^^^^^^^^^ //
// ^^^^^^^高优先级区^^^^^^^ //
// ^^^^^^^^^^^^^^高优先级区^^^^^^^^^^^^^^ //
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^高优先级区^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
// ----------------------------高优先级区---------------------------- //
// //
// //
// //
// //
// //
// ----------------------------中优先级区---------------------------- //
// vvvvvvvvvvvvvvvvvvvvvvvvvvvv中优先级区vvvvvvvvvvvvvvvvvvvvvvvvvvvv //
// vvvvvvvvvvvvvv中优先级区vvvvvvvvvvvvvv //
// vvvvvvv中优先级区vvvvvvv //
// vvvvvvvvvvvvvv //
// vvvv //

_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/anotherfortune" // 另一个今日人品
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/chatgpt" // ChatGPT对话
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/chinesebqb" // 表情包
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/cybercat" // 云养猫
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/draw" // 服务详情
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/exJiangRed" // 江林的插件编写教学
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/exXiaoGuoFan" // 小锅饭的示例
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/fadian" // 每日发癫
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/fgopickup" // FGO卡池查询
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/fyzhq" // 发音转换器
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/games" // 游戏系统
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/klala" // 星穹铁道面板/图鉴查询
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/kokomi" // 原神面板查询
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/moegozh" // VITS模型拟声迫真中文
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/movies" // 电影查询
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/ottoshout" // otto鬼叫
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/partygame" // 轮盘赌
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/playwright" // 网页截图
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/qqci" // 简易CI/CD
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/qqclean" // QQ号清理
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/recall" // 回复撤回
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/rsshub" // RssHub订阅
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/slash" // Slash自交互
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/subweibo" // 订阅微博消息
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/tgyj" // 同归于尽
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/vote" // 投票
_ "github.com/FloatTech/ZeroBot-Plugin-Playground/plugin/youdaotranslate" // 有道翻译

// _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wtf" // 鬼东西

// ^^^^ //
// ^^^^^^^^^^^^^^ //
// ^^^^^^^中优先级区^^^^^^^ //
// ^^^^^^^^^^^^^^中优先级区^^^^^^^^^^^^^^ //
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^中优先级区^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
// ----------------------------中优先级区---------------------------- //
// //
// //
// //
// //
// //
// ----------------------------低优先级区---------------------------- //
// vvvvvvvvvvvvvvvvvvvvvvvvvvvv低优先级区vvvvvvvvvvvvvvvvvvvvvvvvvvvv //
// vvvvvvvvvvvvvv低优先级区vvvvvvvvvvvvvv //
// vvvvvvv低优先级区vvvvvvv //
// vvvvvvvvvvvvvv //
// vvvv //

// ^^^^ //
// ^^^^^^^^^^^^^^ //
// ^^^^^^^低优先级区^^^^^^^ //
// ^^^^^^^^^^^^^^低优先级区^^^^^^^^^^^^^^ //
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^低优先级区^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
// ----------------------------低优先级区---------------------------- //
// //
// //
// //
// //
// //
// -----------------------以下为内置依赖，勿动------------------------ //
zero "github.com/wdvxdr1123/ZeroBot"
"github.com/wdvxdr1123/ZeroBot/driver"
// -----------------------以上为内置依赖，勿动------------------------ //
)

type zbpcfg struct {
Expand Down
0 example/JiangRed/message.go → plugin/exJiangRed/message.go
View file
Open in desktop
File renamed without changes.
0 example/xiaoguofan/example.go → plugin/exXiaoGuoFan/example.go
View file
Open in desktop
File renamed without changes.
Loading