Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
b66a035
build(deps): bump alpine from 3.21 to 3.24
dependabot[bot] Sep 7, 2026
19d9945
build(deps): bump golang from 1.25-alpine to 1.27-alpine
dependabot[bot] Sep 7, 2026
52ab681
build(deps): bump actions/setup-go from 5 to 7
dependabot[bot] Sep 22, 2026
35fdd50
build(deps): bump actions/upload-artifact from 4 to 7
dependabot[bot] Sep 22, 2026
c5dffa6
build(deps): bump actions/checkout from 4 to 7
dependabot[bot] Sep 22, 2026
33902bd
build(deps): bump actions/download-artifact from 4 to 8
dependabot[bot] Sep 28, 2026
8b87beb
build(deps): bump softprops/action-gh-release from 2 to 3
dependabot[bot] Sep 28, 2026
1231e9a
chore(ci): merge main into dependabot/github_actions/softprops/action…
Oct 23, 2026
10362fa
chore(ci): merge main into dependabot/github_actions/actions/download…
Oct 23, 2026
565ac0b
chore(ci): merge main into dependabot/docker/golang-1.27-alpine
Oct 23, 2026
4debed4
chore(ci): merge main into dependabot/docker/alpine-3.24
Oct 23, 2026
1fd887d
chore(ci): merge main into dependabot/github_actions/actions/checkout-7
Oct 23, 2026
a5431c0
chore(ci): merge main into dependabot/github_actions/actions/setup-go-7
Oct 23, 2026
8b36ba4
chore(ci): merge main into dependabot/github_actions/actions/upload-a…
Oct 23, 2026
e72117d
Merge pull request #1 from FasterEdge/dependabot/github_actions/actio…
Oct 23, 2026
55fc2ae
Merge pull request #2 from FasterEdge/dependabot/github_actions/actio…
Oct 23, 2026
5ed75da
Merge pull request #4 from FasterEdge/dependabot/docker/alpine-3.24
Oct 23, 2026
0e3f9ea
Merge pull request #5 from FasterEdge/dependabot/docker/golang-1.27-a…
Oct 23, 2026
fb8f1fe
Merge pull request #6 from FasterEdge/dependabot/github_actions/actio…
Oct 23, 2026
72af6a2
Merge pull request #7 from FasterEdge/dependabot/github_actions/softp…
Oct 23, 2026
decd9d7
merge dependabot/github_actions/actions/checkout-7
Oct 23, 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
8 changes: 4 additions & 4 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
docker-build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- name: 'Go 单元测试'
uses: actions/setup-go@v5
uses: actions/setup-go@v7
with:
go-version: '1.26'
- name: '运行测试'
Expand All @@ -36,15 +36,15 @@ jobs:
- name: '计算工件名'
shell: bash
run: echo "ARTIFACT_NAME=proxyarea-docker-image-${GITHUB_REF_NAME//\//-}" >> "$GITHUB_ENV"
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
with:
name: ${{ env.ARTIFACT_NAME }}
path: 'proxyarea-image.tar.gz'
if-no-files-found: 'warn'
retention-days: 14
- name: '上传镜像包到 Release'
if: github.event_name == 'release' || startsWith(github.ref, 'refs/tags/v')
uses: softprops/action-gh-release@v2
uses: softprops/action-gh-release@v3
with:
tag_name: ${{ github.event.release.tag_name || github.ref_name }}
files: 'proxyarea-image.tar.gz'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ jobs:
- { target: windows-amd64, goos: windows, goarch: amd64, ext: .exe }
- { target: windows-arm64, goos: windows, goarch: arm64, ext: .exe }
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
- uses: actions/checkout@v7
- uses: actions/setup-go@v7
with:
go-version: '1.26'
- name: '编译 ${{ matrix.target }}'
Expand All @@ -42,7 +42,7 @@ jobs:
else
tar czf ../proxyarea-${{ matrix.target }}.tar.gz proxyarea
fi
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
with:
name: 'proxyarea-${{ matrix.target }}'
path: '${{ github.workspace }}/proxyarea-${{ matrix.target }}.*'
Expand All @@ -54,7 +54,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
path: artifacts
merge-multiple: true
Expand All @@ -72,7 +72,7 @@ jobs:
| sort -z | xargs -0 -r sha1sum > checksums-sha1.txt
- name: '上传到 Release'
if: github.event_name != 'workflow_dispatch' || github.event.inputs.tag != ''
uses: softprops/action-gh-release@v2
uses: softprops/action-gh-release@v3
with:
tag_name: ${{ github.event.inputs.tag || github.event.release.tag_name || github.ref_name }}
files: 'release/*'
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ---- Build stage ----
FROM golang:1.25-alpine AS build
FROM golang:1.27-alpine AS build
# 通过 goproxy.cn 拉取依赖, 避免在无外网代理环境(如国内网络/受限内网)构建超时
ENV GOPROXY=https://goproxy.cn,direct

Expand All @@ -16,7 +16,7 @@ RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -ldflags='-s -w' -o /out/proxyar

# ---- Runtime stage ----
# alpine:latest 会随上游漂移导致不可复现构建; 固定 minor 版本。
FROM alpine:3.21
FROM alpine:3.24

RUN apk --no-cache add ca-certificates wget && \
addgroup -g 1001 -S appgroup && \
Expand Down
Loading