Skip to content

Commit 5a2b4e2

Browse files
author
FasterEdge
committed
chore(ci): merge main into dependabot/docker/alpine-3.24
Bring the PR branch up to date with main so PR CI runs the fixed workflows.
2 parents d077978 + 248836a commit 5a2b4e2

6 files changed

Lines changed: 29 additions & 30 deletions

File tree

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

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

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- uses: actions/checkout@v4
2929
- uses: actions/setup-go@v5
3030
with:
31-
go-version: '1.25'
31+
go-version: '1.26'
3232
- name: '编译 ${{ matrix.target }}'
3333
run: |
3434
mkdir -p dist

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1.7
22
# 多阶段构建:golang 编译 → alpine 精简运行镜像(约 10MB)
3-
FROM golang:1.25-alpine AS build
3+
FROM golang:1.26-alpine AS build
44
# 通过 goproxy.cn 拉取依赖, 避免在无外网代理环境(如国内网络/受限内网)构建超时
55
ENV GOPROXY=https://goproxy.cn,direct
66
WORKDIR /src

‎cmd/fasteredge2api/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/FasterEdge/FasterEdge2Api/internal/server"
2525
)
2626

27-
const version = "1.0.20260922"
27+
const version = "1.0.20261022"
2828

2929
func main() {
3030
if err := run(os.Args[1:]); err != nil {

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
module github.com/FasterEdge/FasterEdge2Api
22

3-
go 1.25.5
3+
go 1.26.0
44

55
require (
6-
github.com/FasterEdge/FasterEdge v1.0.20260913
7-
golang.org/x/sys v0.47.0
6+
github.com/FasterEdge/FasterEdge v1.0.20261022
7+
golang.org/x/sys v0.49.0
88
)
99

1010
require (
11-
github.com/beevik/ntp v1.5.0 // indirect
12-
golang.org/x/net v0.58.0 // indirect
11+
github.com/beevik/ntp v1.6.0 // indirect
12+
golang.org/x/net v0.61.0 // indirect
1313
)

‎go.sum‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
1-
github.com/FasterEdge/FasterEdge v1.0.20260903 h1:IgDo2C/hcE3exFXrspKFpiQWuC31LX1OKHAJDHKloJo=
2-
github.com/FasterEdge/FasterEdge v1.0.20260903/go.mod h1:4x6loB8NocJYgy9EbeVFhMJSBo/QJI8zQ63zxgtaSaU=
3-
github.com/FasterEdge/FasterEdge v1.0.20260913 h1:mTg9WTf7DYPYkPKu5KHQ1hbUpTOolJhqTWwZL00w0tI=
4-
github.com/FasterEdge/FasterEdge v1.0.20260913/go.mod h1:4x6loB8NocJYgy9EbeVFhMJSBo/QJI8zQ63zxgtaSaU=
5-
github.com/beevik/ntp v1.5.0 h1:y+uj/JjNwlY2JahivxYvtmv4ehfi3h74fAuABB9ZSM4=
6-
github.com/beevik/ntp v1.5.0/go.mod h1:mJEhBrwT76w9D+IfOEGvuzyuudiW9E52U2BaTrMOYow=
7-
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
8-
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
9-
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
10-
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
11-
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
12-
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
13-
golang.org/x/net v0.58.0 h1:ynWG7rqYi4ccpTEuPZ2QGWHktVEM9DMCj9yzDE0Q7To=
14-
golang.org/x/net v0.58.0/go.mod h1:YwCddHnFlT7eLQqVprV19OnhLGtc5xOKgE0RyqgfWAU=
15-
golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
16-
golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
17-
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
18-
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
1+
github.com/FasterEdge/FasterEdge v1.0.20261022 h1:2i52w/icCEIwXRYavnn9XujEvtw5bp3KtGSSk8TVZ+w=
2+
github.com/FasterEdge/FasterEdge v1.0.20261022/go.mod h1:PfpdlmUm1AabL24xVDdAFp/V8gxBNL/wndRmYj3igoo=
3+
github.com/beevik/ntp v1.6.0 h1:bW359Vvw6bicGhKsVi+ZDLMsMYzb2ohUpLaF/Juv0k8=
4+
github.com/beevik/ntp v1.6.0/go.mod h1:VTAbDFySkuc8cQiAYHhXslAHjJdenICebskhYqBWC4k=
5+
github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
6+
github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
7+
go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw=
8+
go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg=
9+
golang.org/x/net v0.61.0 h1:RR+6j/BTBCrggOLugxa+66R8FvoN6MHlzDlZIbN9YFw=
10+
golang.org/x/net v0.61.0/go.mod h1:WgDCOTH8iwtB66T4/GfI94AHo/hhdb7Hah9NDseQfiI=
11+
golang.org/x/sys v0.49.0 h1:XbzkgYJHdqh/8m2Uu0W/dQv8nktxx4BFHp1M0gROTXA=
12+
golang.org/x/sys v0.49.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og=

0 commit comments

Comments
 (0)