Skip to content

Commit c38461a

Browse files
committed
fix ci
1 parent 315438a commit c38461a

File tree

4 files changed

+46
-17
lines changed

4 files changed

+46
-17
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 4 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 ./...

.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

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"

0 commit comments

Comments
 (0)