Skip to content

Commit 9b84508

Browse files
Janet-BakerJanet-Baker
committed
fix ci
make lint happy
1 parent 315438a commit 9b84508

File tree

10 files changed

+58
-33
lines changed

10 files changed

+58
-33
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,27 @@ jobs:
2323
- name: Cache Go modules
2424
uses: actions/cache@v4
2525
with:
26-
path: ~/go/pkg/mod
27-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
26+
path: |
27+
~/.cache/go-build
28+
~/go/pkg/mod
29+
key: ${{ runner.os }}-go-${{ github.workflow }}-${{ hashFiles('**/go.sum') }}-${{ hashFiles('**/go.mod') }}
2830
restore-keys: |
31+
${{ runner.os }}-go-${{ github.workflow }}-
2932
${{ runner.os }}-go-
33+
fail-on-cache-miss: false
3034

3135
- name: Download dependencies
32-
run: go mod download
36+
run: |
37+
go mod download
38+
go mod tidy
39+
go mod verify || true
40+
# 如果verify失败，继续构建，因为可能是CI环境中的临时问题
3341
3442
- name: Run tests
3543
run: go test -v ./...
3644

3745
- name: Build
38-
run: go build -v .
46+
run: go build -mod=readonly -v .
3947

4048
- name: Run go vet
4149
run: go vet ./...
@@ -44,4 +52,4 @@ jobs:
4452
uses: golangci/golangci-lint-action@v6
4553
with:
4654
version: latest
47-
args: --timeout=5m
55+
args: --timeout=5m --config=.golangci.yml

‎.github/workflows/release.yml‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,21 @@ jobs:
5757
- name: Cache Go modules
5858
uses: actions/cache@v4
5959
with:
60-
path: ~/go/pkg/mod
61-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
60+
path: |
61+
~/.cache/go-build
62+
~/go/pkg/mod
63+
key: ${{ runner.os }}-go-${{ matrix.goos }}-${{ matrix.goarch }}-${{ hashFiles('**/go.sum') }}-${{ hashFiles('**/go.mod') }}
6264
restore-keys: |
65+
${{ runner.os }}-go-${{ matrix.goos }}-${{ matrix.goarch }}-
6366
${{ runner.os }}-go-
67+
fail-on-cache-miss: false
6468

6569
- name: Download dependencies
66-
run: go mod download
70+
run: |
71+
go mod download
72+
go mod tidy
73+
go mod verify || true
74+
# 如果verify失败，继续构建，因为可能是CI环境中的临时问题
6775
6876
- name: Build
6977
env:
@@ -74,7 +82,9 @@ jobs:
7482
run: |
7583
mkdir -p dist
7684
output_name="${{ matrix.filename }}"
77-
go build -ldflags="-s -w -X main.version=${{ github.ref_name }}" -o "dist/${output_name}" .
85+
# 确保在构建前重新同步依赖
86+
go mod download
87+
go build -mod=readonly -ldflags="-s -w -X main.version=${{ github.ref_name }}" -o "dist/${output_name}" .
7888
7989
- name: Create archive
8090
run: |
@@ -122,17 +132,18 @@ jobs:
122132
# 获取上一个tag
123133
PREVIOUS_TAG=$(git describe --tags --abbrev=0 HEAD^ 2>/dev/null || echo "")
124134
if [ -n "$PREVIOUS_TAG" ]; then
125-
echo "## 更新内容" > CHANGELOG.md
126-
echo "" >> CHANGELOG.md
127-
git log --pretty=format:"- %s (%h)" $PREVIOUS_TAG..HEAD >> CHANGELOG.md
135+
echo "changelog<<EOF" >> $GITHUB_OUTPUT
136+
echo "## 更新内容" >> $GITHUB_OUTPUT
137+
echo "" >> $GITHUB_OUTPUT
138+
git log --pretty=format:"- %s (%h)" $PREVIOUS_TAG..HEAD >> $GITHUB_OUTPUT
139+
echo "EOF" >> $GITHUB_OUTPUT
128140
else
129-
echo "## 首次发布" > CHANGELOG.md
130-
echo "" >> CHANGELOG.md
131-
git log --pretty=format:"- %s (%h)" >> CHANGELOG.md
141+
echo "changelog<<EOF" >> $GITHUB_OUTPUT
142+
echo "## 首次发布" >> $GITHUB_OUTPUT
143+
echo "" >> $GITHUB_OUTPUT
144+
git log --pretty=format:"- %s (%h)" >> $GITHUB_OUTPUT
145+
echo "EOF" >> $GITHUB_OUTPUT
132146
fi
133-
echo "changelog<<EOF" >> $GITHUB_OUTPUT
134-
cat CHANGELOG.md >> $GITHUB_OUTPUT
135-
echo "EOF" >> $GITHUB_OUTPUT
136147
137148
- name: Create Release
138149
uses: softprops/action-gh-release@v2

‎.golangci.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
linters:
2+
disable:
3+
- unused

‎bilibiliInfo/GetRoomInfo.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ func reqHeaderSetter(header *http.Header) {
5252
header.Set("Sec-Fetch-Site", "same-site")
5353
header.Set("Sec-Gpc", "1")
5454
header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36 Edg/117.0.2045.55")
55-
return
5655
}
5756
func getAndUnmarshal(url string, v any) error {
5857
req, errRequest := http.NewRequest("GET", url, nil)

‎messageSender/messageStruct.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ func (message *GeneralPushMessage) SendToAllTargets() {
4545
servers[i].SendMessage(message)
4646
}(i)
4747
}
48-
return
4948
}
5049

5150
type MessageServer interface {

‎messageSender/sendWXWorkAppMessage.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,5 +193,4 @@ func (app WXWorkAppTarget) SendMessage(message Message) {
193193
if log.IsLevelEnabled(log.DebugLevel) {
194194
log.Debug("发送企业微信应用消息成功 响应消息", string(content))
195195
}
196-
return
197196
}

‎scripts/build.bat‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ echo ⏰ 构建时间: %BUILD_TIME%
2727
echo 🔧 Git提交: %GIT_COMMIT%
2828
echo.
2929

30+
echo 📥 检查和更新依赖...
31+
go mod tidy
32+
go mod verify
33+
34+
echo.
3035
REM 开始构建
3136
call :build linux amd64 "" webhookGo-linux-amd64
3237
call :build linux arm64 "" webhookGo-linux-arm64

‎scripts/build.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ platforms=(
3636
"freebsd/amd64"
3737
)
3838

39+
# 确保依赖正确
40+
echo "📥 检查和更新依赖..."
41+
go mod tidy
42+
go mod verify
43+
3944
# 开始构建
4045
for platform in "${platforms[@]}"; do
4146
IFS='/' read -r goos goarch goarm <<< "$platform"

‎webhookHandler/BililiveRecorderWebhookHandler.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,20 @@ func (message *BililiveRecorderMessageStruct) GetContent() string {
7676
contentBuilder.WriteString(message.EventData.RelativePath)
7777
contentBuilder.WriteString("\n- 文件打开时间：")
7878
contentBuilder.WriteString(message.EventData.FileOpenTime)
79-
fallthrough
79+
8080
case "FileClosed":
81+
contentBuilder.WriteString("\n- 录制任务：")
82+
contentBuilder.WriteString(message.EventData.SessionId)
83+
contentBuilder.WriteString("\n- 文件：")
84+
contentBuilder.WriteString(message.EventData.RelativePath)
85+
contentBuilder.WriteString("\n- 文件打开时间：")
86+
contentBuilder.WriteString(message.EventData.FileOpenTime)
8187
contentBuilder.WriteString("\n- 时长：")
8288
contentBuilder.WriteString(secondsToString(message.EventData.Duration))
8389
contentBuilder.WriteString("\n- 文件大小：")
8490
contentBuilder.WriteString(formatStorageSpace(message.EventData.FileSize))
8591
contentBuilder.WriteString("\n- 文件关闭时间：")
8692
contentBuilder.WriteString(message.EventData.FileCloseTime)
87-
break
8893

8994
case "StreamStarted":
9095
liveStatus, liveTime := bilibiliInfo.GetLiveStatusString(message.EventData.RoomId)

‎webhookHandler/DDTV3WebhookHandler.go‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func ddtv3TaskRunner(path string, content []byte) {
3737

3838
// 判断事件类型
3939
eventType := getter.GetInt("type")
40-
eventSettings, _ := ddtv3Settings[path][eventType]
40+
eventSettings := ddtv3Settings[path][eventType]
4141
switch eventType {
4242
// 0 StartLive 主播开播
4343
case 0:
@@ -75,7 +75,6 @@ func ddtv3TaskRunner(path string, content []byte) {
7575
}
7676
msg.SendToAllTargets()
7777
}
78-
break
7978

8079
// 1 StopLive 主播下播
8180
case 1:
@@ -122,7 +121,6 @@ func ddtv3TaskRunner(path string, content []byte) {
122121
}
123122
msg.SendToAllTargets()
124123
}
125-
break
126124

127125
// 2 StartRec 开始录制
128126
// 3 RecComplete 录制结束
@@ -168,7 +166,6 @@ func ddtv3TaskRunner(path string, content []byte) {
168166
}
169167
msg.SendToAllTargets()
170168
}
171-
break
172169

173170
// 10 RunShellComplete 执行Shell命令完成
174171
// 16 ShellExecutionComplete 执行Shell命令结束
@@ -212,7 +209,6 @@ func ddtv3TaskRunner(path string, content []byte) {
212209
}
213210
msg.SendToAllTargets()
214211
}
215-
break
216212

217213
// 11 DownloadEndMissionSuccess 下载任务成功结束
218214
case 11:
@@ -256,7 +252,6 @@ func ddtv3TaskRunner(path string, content []byte) {
256252
}
257253
msg.SendToAllTargets()
258254
}
259-
break
260255

261256
// 12 SpaceIsInsufficientWarn 剩余空间不足
262257
// 14 LoginWillExpireSoon 登陆即将失效
@@ -276,7 +271,6 @@ func ddtv3TaskRunner(path string, content []byte) {
276271
}
277272
msg.SendToAllTargets()
278273
}
279-
break
280274

281275
// 13 LoginFailure 登陆失效
282276
case 13:
@@ -290,7 +284,6 @@ func ddtv3TaskRunner(path string, content []byte) {
290284
}
291285
msg.SendToAllTargets()
292286
}
293-
break
294287

295288
// 15 UpdateAvailable 有可用新版本
296289
case 15:
@@ -307,7 +300,6 @@ func ddtv3TaskRunner(path string, content []byte) {
307300
}
308301
msg.SendToAllTargets()
309302
}
310-
break
311303

312304
// 19 RoomLocked 直播间被封禁
313305
case 19:
@@ -343,7 +335,6 @@ func ddtv3TaskRunner(path string, content []byte) {
343335
}
344336
msg.SendToAllTargets()
345337
}
346-
break
347338

348339
// 别的不关心，所以没写
349340
default:

0 commit comments

Comments
 (0)