diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 924fc7f..e734c30 100755 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -18,7 +18,7 @@ jobs: with: images: | nite07/sub2sing-box - ghcr.io/nitezs/sub2sing-box + ghcr.io/bestnite/sub2sing-box tags: | type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3560ccb..9527455 100755 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,10 +13,10 @@ 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 @@ -24,7 +24,7 @@ jobs: 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 d4403bd..c10e504 100755 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -1,3 +1,4 @@ +version: 2 project_name: sub2sing-box builds: - env: @@ -9,16 +10,15 @@ builds: goarch: - amd64 - arm64 - - arm - "386" ldflags: - - -s -w -X github.com/nitezs/sub2sing-box/constant.Version={{ .Version }} + - -s -w -X github.com/bestnite/sub2sing-box/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 +30,16 @@ release: upx: - enabled: true compress: best +nfpms: + - id: sub2sing-box + homepage: https://github.com/bestnite/sub2sing-box + maintainer: Nite + license: "MIT" + formats: + - apk + - deb + - rpm + - termux.deb + - archlinux + provides: + - sub2sing-box diff --git a/Dockerfile b/Containerfile similarity index 82% rename from Dockerfile rename to Containerfile index 42d9b12..108d73e 100755 --- a/Dockerfile +++ b/Containerfile @@ -5,7 +5,7 @@ WORKDIR /app COPY . . RUN go mod download ARG version -RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w -X github.com/nitezs/sub2sing-box/constant.Version=${version}" -o sub2sing-box . +RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w -X github.com/bestnite/sub2sing-box/constant.Version=${version}" -o sub2sing-box . WORKDIR /app FROM alpine:latest diff --git a/api/handler/convert.go b/api/handler/convert.go index 4923655..a737cca 100755 --- a/api/handler/convert.go +++ b/api/handler/convert.go @@ -3,9 +3,9 @@ package handler import ( "encoding/json" - "github.com/nitezs/sub2sing-box/common" - "github.com/nitezs/sub2sing-box/model" - "github.com/nitezs/sub2sing-box/util" + "github.com/bestnite/sub2sing-box/common" + "github.com/bestnite/sub2sing-box/model" + "github.com/bestnite/sub2sing-box/util" "github.com/gin-gonic/gin" ) diff --git a/api/server.go b/api/server.go index 59681a8..c61a994 100755 --- a/api/server.go +++ b/api/server.go @@ -7,7 +7,7 @@ import ( "net/http" "strconv" - "github.com/nitezs/sub2sing-box/api/handler" + "github.com/bestnite/sub2sing-box/api/handler" "github.com/gin-gonic/gin" ) diff --git a/cmd/convert.go b/cmd/convert.go index 5460623..fe01348 100755 --- a/cmd/convert.go +++ b/cmd/convert.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/nitezs/sub2sing-box/common" - "github.com/nitezs/sub2sing-box/model" + "github.com/bestnite/sub2sing-box/common" + "github.com/bestnite/sub2sing-box/model" "github.com/spf13/cobra" ) diff --git a/cmd/server.go b/cmd/server.go index 0275292..7b10b5e 100755 --- a/cmd/server.go +++ b/cmd/server.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/nitezs/sub2sing-box/api" + "github.com/bestnite/sub2sing-box/api" "github.com/spf13/cobra" ) diff --git a/cmd/version.go b/cmd/version.go index 8f6b76c..cd38d4d 100755 --- a/cmd/version.go +++ b/cmd/version.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/nitezs/sub2sing-box/constant" + "github.com/bestnite/sub2sing-box/constant" "github.com/spf13/cobra" ) diff --git a/common/convert.go b/common/convert.go index 9776745..1df7993 100755 --- a/common/convert.go +++ b/common/convert.go @@ -12,10 +12,10 @@ import ( "sort" "strings" - "github.com/nitezs/sub2sing-box/constant" - "github.com/nitezs/sub2sing-box/model" - "github.com/nitezs/sub2sing-box/parser" - "github.com/nitezs/sub2sing-box/util" + "github.com/bestnite/sub2sing-box/constant" + "github.com/bestnite/sub2sing-box/model" + "github.com/bestnite/sub2sing-box/parser" + "github.com/bestnite/sub2sing-box/util" box "github.com/sagernet/sing-box" C "github.com/sagernet/sing-box/constant" "github.com/sagernet/sing-box/include" diff --git a/docker-compose.yaml b/compose.yaml similarity index 100% rename from docker-compose.yaml rename to compose.yaml diff --git a/go.mod b/go.mod index 28f1002..b4f5b88 100755 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/nitezs/sub2sing-box +module github.com/bestnite/sub2sing-box go 1.25 diff --git a/main.go b/main.go index bb83faf..3f2a7df 100755 --- a/main.go +++ b/main.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/nitezs/sub2sing-box/cmd" + "github.com/bestnite/sub2sing-box/cmd" ) func main() { diff --git a/parser/anytls.go b/parser/anytls.go index e474bba..0e3a77e 100644 --- a/parser/anytls.go +++ b/parser/anytls.go @@ -5,8 +5,8 @@ import ( "net/url" "strings" - "github.com/nitezs/sub2sing-box/constant" - "github.com/nitezs/sub2sing-box/model" + "github.com/bestnite/sub2sing-box/constant" + "github.com/bestnite/sub2sing-box/model" "github.com/sagernet/sing-box/option" ) diff --git a/parser/hysteria.go b/parser/hysteria.go index 2fd6149..0017330 100755 --- a/parser/hysteria.go +++ b/parser/hysteria.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/nitezs/sub2sing-box/constant" - "github.com/nitezs/sub2sing-box/model" + "github.com/bestnite/sub2sing-box/constant" + "github.com/bestnite/sub2sing-box/model" "github.com/sagernet/sing-box/option" "github.com/sagernet/sing/common/byteformats" ) diff --git a/parser/hysteria2.go b/parser/hysteria2.go index f6227ab..e49bc3f 100755 --- a/parser/hysteria2.go +++ b/parser/hysteria2.go @@ -5,8 +5,8 @@ import ( "net/url" "strings" - "github.com/nitezs/sub2sing-box/constant" - "github.com/nitezs/sub2sing-box/model" + "github.com/bestnite/sub2sing-box/constant" + "github.com/bestnite/sub2sing-box/model" "github.com/sagernet/sing-box/option" ) diff --git a/parser/parsers_map.go b/parser/parsers_map.go index 1ce06aa..6129ca9 100755 --- a/parser/parsers_map.go +++ b/parser/parsers_map.go @@ -1,8 +1,8 @@ package parser import ( - "github.com/nitezs/sub2sing-box/constant" - "github.com/nitezs/sub2sing-box/model" + "github.com/bestnite/sub2sing-box/constant" + "github.com/bestnite/sub2sing-box/model" ) var ParserMap map[string]func(string) (model.Outbound, error) = map[string]func(string) (model.Outbound, error){ diff --git a/parser/shadowsocks.go b/parser/shadowsocks.go index 47b2e2a..4a516be 100755 --- a/parser/shadowsocks.go +++ b/parser/shadowsocks.go @@ -5,9 +5,9 @@ import ( "net/url" "strings" - "github.com/nitezs/sub2sing-box/constant" - "github.com/nitezs/sub2sing-box/model" - "github.com/nitezs/sub2sing-box/util" + "github.com/bestnite/sub2sing-box/constant" + "github.com/bestnite/sub2sing-box/model" + "github.com/bestnite/sub2sing-box/util" "github.com/sagernet/sing-box/option" ) diff --git a/parser/socks.go b/parser/socks.go index f1beb57..b0ff81f 100644 --- a/parser/socks.go +++ b/parser/socks.go @@ -5,9 +5,9 @@ import ( "net/url" "strings" - "github.com/nitezs/sub2sing-box/constant" - "github.com/nitezs/sub2sing-box/model" - "github.com/nitezs/sub2sing-box/util" + "github.com/bestnite/sub2sing-box/constant" + "github.com/bestnite/sub2sing-box/model" + "github.com/bestnite/sub2sing-box/util" "github.com/sagernet/sing-box/option" ) diff --git a/parser/trojan.go b/parser/trojan.go index bd87dae..5835da3 100755 --- a/parser/trojan.go +++ b/parser/trojan.go @@ -5,8 +5,8 @@ import ( "net/url" "strings" - "github.com/nitezs/sub2sing-box/constant" - "github.com/nitezs/sub2sing-box/model" + "github.com/bestnite/sub2sing-box/constant" + "github.com/bestnite/sub2sing-box/model" "github.com/sagernet/sing-box/option" "github.com/sagernet/sing/common/json/badoption" diff --git a/parser/vless.go b/parser/vless.go index caaf32f..93339a8 100755 --- a/parser/vless.go +++ b/parser/vless.go @@ -5,8 +5,8 @@ import ( "net/url" "strings" - "github.com/nitezs/sub2sing-box/constant" - "github.com/nitezs/sub2sing-box/model" + "github.com/bestnite/sub2sing-box/constant" + "github.com/bestnite/sub2sing-box/model" "github.com/sagernet/sing-box/option" "github.com/sagernet/sing/common/json/badoption" ) diff --git a/parser/vmess.go b/parser/vmess.go index 08dbe20..076dd93 100755 --- a/parser/vmess.go +++ b/parser/vmess.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" - "github.com/nitezs/sub2sing-box/constant" - "github.com/nitezs/sub2sing-box/model" - "github.com/nitezs/sub2sing-box/util" + "github.com/bestnite/sub2sing-box/constant" + "github.com/bestnite/sub2sing-box/model" + "github.com/bestnite/sub2sing-box/util" "github.com/sagernet/sing-box/option" "github.com/sagernet/sing/common/json/badoption" )