diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index fc9180f..89cedad 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -45,7 +45,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: build-args: | "version=${{ github.ref_name }}" @@ -53,3 +53,5 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} platforms: linux/amd64,linux/arm64,linux/arm/v7 + file: Containerfile + diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aa60754..9527455 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,13 +13,18 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 + + - name: Install UPX + uses: crazy-max/ghaction-upx@v3 + with: + install-only: true - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v5 + uses: goreleaser/goreleaser-action@v6 with: distribution: goreleaser version: latest diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 3adf74d..bf3e954 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -1,3 +1,4 @@ +version: 2 project_name: sub2clash builds: - env: @@ -9,19 +10,15 @@ builds: goarch: - amd64 - arm64 - - arm - "386" - goarm: - - "6" - - "7" ldflags: - - -s -w -X sub2clash/constant.Version={{ .Version }} + - -s -w -X github.com/bestnite/sub2clash/constant.Version={{ .Version }} flags: - -trimpath archives: - - format: tar.gz + - formats: ["tar.gz"] format_overrides: - - format: zip + - formats: ["zip"] goos: windows wrap_in_directory: true files: @@ -30,3 +27,19 @@ archives: - templates release: draft: true +upx: + - enabled: true + compress: best +nfpms: + - id: sub2clash + homepage: https://github.com/bestnite/sub2clash + maintainer: Nite + license: "MIT" + formats: + - apk + - deb + - rpm + - termux.deb + - archlinux + provides: + - sub2clash diff --git a/Dockerfile b/Containerfile similarity index 90% rename from Dockerfile rename to Containerfile index 325ed57..8b7e807 100644 --- a/Dockerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM golang:1.21-alpine as builder +FROM golang:1.25 as builder LABEL authors="nite07" WORKDIR /app COPY . . diff --git a/go.mod b/go.mod index 6d761cb..d0b4be9 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/bestnite/sub2clash -go 1.21.0 - -toolchain go1.24.3 +go 1.25 require ( github.com/gin-gonic/gin v1.10.1