Skip to content

Commit bbadb52

Browse files
author
FasterEdge
committed
chore(ci): merge main into dependabot/github_actions/actions/setup-go-7
Bring the PR branch up to date with main so PR CI runs the fixed workflows. Resolved: .github/workflows/docker-image.yml
2 parents 3172676 + 0ab8eb7 commit bbadb52

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

‎.github/workflows/docker-image.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,26 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@v4
20-
- name: 'Go 鍗曞厓娴嬭瘯'
20+
- name: 'Go 单元测试'
2121
uses: actions/setup-go@v7
2222
with:
23-
go-version: '1.25'
24-
- name: '杩愯娴嬭瘯'
23+
go-version: '1.26'
24+
- name: '运行测试'
2525
run: go test ./...
2626
- name: '构建 Docker 镜像'
2727
run: |
2828
docker build -t simplewebshell-remoteupdate .
2929
- name: '导出并上传镜像工件'
3030
run: |
3131
docker save simplewebshell-remoteupdate | gzip > simplewebshell-remoteupdate-image.tar.gz
32+
# PR 的 ref_name 形如 15/merge,dependabot 分支名也含斜杠,
33+
# 而 upload-artifact 的工件名不允许出现 /,这里统一替换为连字符。
34+
- name: '计算工件名'
35+
shell: bash
36+
run: echo "ARTIFACT_NAME=simplewebshell-remoteupdate-docker-image-${GITHUB_REF_NAME//\//-}" >> "$GITHUB_ENV"
3237
- uses: actions/upload-artifact@v4
3338
with:
34-
name: 'simplewebshell-remoteupdate-docker-image-${{ github.ref_name }}'
39+
name: ${{ env.ARTIFACT_NAME }}
3540
path: 'simplewebshell-remoteupdate-image.tar.gz'
3641
if-no-files-found: 'warn'
3742
retention-days: 14

‎main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/FasterEdge/SimpleWebShell-RemoteUpdate/internal/workflow"
1717
)
1818

19-
var version = "1.0.20260922"
19+
var version = "1.0.20261022"
2020

2121
func main() {
2222
os.Exit(run(os.Args[1:]))

0 commit comments

Comments
 (0)