chore: bump version to 1.8.5

2025-12-16 00:33:48 +00:00 · 2025-11-21 01:33:15 +08:00 · 2025-11-21 01:33:15 +08:00 · 64bfc2c5c4
commit 64bfc2c5c4
parent f366aa2ce9
9 changed files with 95 additions and 14 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -1,4 +1,4 @@
-name: Build and Release OpenWRT Package
+name: Build and Release Packages and Binaries

 on:
  push:
@ -9,7 +9,7 @@ permissions:
  contents: write

 jobs:
-  build:
+  build-openwrt:
    name: Build ${{ matrix.arch }} on ${{ matrix.version }}
    runs-on: ubuntu-latest
    strategy:
@ -33,35 +33,111 @@ jobs:
      - name: Build
        uses: openwrt/gh-action-sdk@v9
        env:
-          ARCH: ${{ matrix.arch }}
+          ARCH: ${{ matrix.arch }}-${{ matrix.version }}
          FEEDNAME: ua3f_ci
          PACKAGES: openwrt

      - name: Rename packages with arch suffix
        run: |
          cd bin/packages/${{ matrix.arch }}/ua3f_ci/
-          for f in *.ipk; do mv "$f" "${f/.ipk/-${{ matrix.arch }}.ipk}" 2>/dev/null || true; done
          for f in *.apk; do mv "$f" "${f/.apk/-${{ matrix.arch }}.apk}" 2>/dev/null || true; done

      - name: Upload packages
        uses: actions/upload-artifact@v4
        with:
-          name: packages-${{ matrix.arch }}
+          name: packages-${{ matrix.arch }}-${{ matrix.version }}
          path: bin/packages/${{ matrix.arch }}/ua3f_ci/*.*pk
          retention-days: 1

+  build-binaries:
+    name: Build ${{ matrix.goos }}/${{ matrix.goarch }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - goos: linux
+            goarch: amd64
+          - goos: linux
+            goarch: arm64
+          - goos: windows
+            goarch: amd64
+          - goos: windows
+            goarch: arm64
+          - goos: darwin
+            goarch: arm64
+          - goos: android
+            goarch: arm64
+
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Set up Go
+        uses: actions/setup-go@v6
+        with:
+          go-version: "1.21"
+
+      - name: Install dependencies
+        run: sudo apt-get update && sudo apt-get install -y zip
+
+      - name: Get version from tag
+        id: get_version
+        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
+
+      - name: Build binary
+        run: |
+          cd src
+          VERSION="${{ steps.get_version.outputs.VERSION }}"
+          GOOS="${{ matrix.goos }}"
+          GOARCH="${{ matrix.goarch }}"
+
+          echo "Building for $GOOS/$GOARCH..."
+
+          CGO_ENABLED=0 GOOS=$GOOS GOARCH=$GOARCH \
+            go build -trimpath -ldflags="-s -w" -o ua3f main.go
+
+          mkdir -p ../dist
+          cd ..
+
+          case "$GOOS" in
+            windows)
+              mv src/ua3f src/ua3f.exe
+              zip "dist/ua3f-${VERSION}-${GOOS}-${GOARCH}.zip" -j src/ua3f.exe
+              ;;
+            darwin)
+              zip -q "dist/ua3f-${VERSION}-${GOOS}-${GOARCH}.zip" -j src/ua3f
+              ;;
+            *)
+              tar -czf "dist/ua3f-${VERSION}-${GOOS}-${GOARCH}.tar.gz" -C src ua3f
+              ;;
+          esac
+
+      - name: Upload binary artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: binary-${{ matrix.goos }}-${{ matrix.goarch }}
+          path: dist/*
+          retention-days: 1
+
  release:
-    needs: [build]
+    needs: [build-openwrt, build-binaries]
    runs-on: ubuntu-latest

    steps:
-      - name: Download packages
+      - name: Download OpenWrt packages
        uses: actions/download-artifact@v4
        with:
          pattern: packages-*
          path: dist/
          merge-multiple: true

+      - name: Download binary packages
+        uses: actions/download-artifact@v4
+        with:
+          pattern: binary-*
+          path: dist/
+          merge-multiple: true
+
      - name: Get version from tag
        id: get_version
        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
--- a/openwrt/Makefile
+++ b/openwrt/Makefile
@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=UA3F
-PKG_VERSION:=1.8.4
+PKG_VERSION:=1.8.5
 PKG_RELEASE:=1

 # PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
--- a/openwrt/files/luci/model/cbi/ua3f.lua
+++ b/openwrt/files/luci/model/cbi/ua3f.lua
@ -6,7 +6,7 @@ local NamedSection = cbi.NamedSection
 local ua3f = cbi.Map("ua3f",
    "UA3F",
    [[
-        <a href="https://github.com/SunBK201/UA3F" target="_blank">Version: 1.8.4</a>
+        <a href="https://github.com/SunBK201/UA3F" target="_blank">Version: 1.8.5</a>
        <br>
        Across the Campus we can reach every corner in the world.
    ]]
--- a/openwrt/po/zh_cn/ua3f.po
+++ b/openwrt/po/zh_cn/ua3f.po
@ -264,7 +264,7 @@ msgid "Set IP ID"
 msgstr "固定 IP ID"

 msgid "Set the IP ID to 0 for packets"
-msgstr "将数据包的 IP ID 设置为 0，不推荐开启，除非你知道这是什么"
+msgstr "将数据包的 IP ID 设置为 0，不推荐开启"

 msgid "Issue Report"
 msgstr "问题反馈"
--- a/scripts/build.sh
+++ b/scripts/build.sh
@ -8,7 +8,7 @@
 set -e

 project_name="ua3f"
-release_version="1.8.4"
+release_version="1.8.5"
 target=main.go

 LINUX_ARCHS="amd64 arm arm64 mipsle mips64 riscv64 386 mipsle-softfloat mipsle-hardfloat armv7 armv8"
--- a/scripts/ipkg/CONTROL/control
+++ b/scripts/ipkg/CONTROL/control
@ -1,5 +1,5 @@
 Package: ua3f
-Version: 1.8.4-1
+Version: 1.8.5-1
 Depends: luci-compat, ipset, iptables, iptables-mod-tproxy, iptables-mod-extra, iptables-mod-nat-extra, kmod-ipt-conntrack, iptables-mod-ipopt, iptables-mod-nfqueue, iptables-mod-conntrack-extra, kmod-nf-conntrack-netlink
 Source: /feed/openwrt
 SourceName: UA3F
--- a/scripts/ipkg/CONTROL/control-e
+++ b/scripts/ipkg/CONTROL/control-e
@ -1,5 +1,5 @@
 Package: ua3f
-Version: 1.8.4-1
+Version: 1.8.5-1
 Depends: luci-compat, ipset, iptables, iptables-mod-tproxy, iptables-mod-extra, iptables-mod-nat-extra, kmod-ipt-conntrack, iptables-mod-ipopt, iptables-mod-nfqueue, iptables-mod-conntrack-extra, kmod-nf-conntrack-netlink
 Source: /feed/openwrt
 SourceName: UA3F
--- a/src/internal/netfilter/nfqueue.go
+++ b/src/internal/netfilter/nfqueue.go
@ -74,6 +74,11 @@ func (s *NfqueueServer) Start() error {
 	//	return fmt.Errorf("nf.SetOption: %w", err)
 	// }

+	err = nf.Con.SetReadBuffer(1024 * 1024 * 2)
+	if err != nil {
+		slog.Error("nf.Con.SetReadBuffer", slog.Any("error", err))
+	}
+
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()

--- a/src/main.go
+++ b/src/main.go
@ -16,7 +16,7 @@ import (
 	"github.com/sunbk201/ua3f/internal/statistics"
 )

-const version = "1.8.4"
+const version = "1.8.5"

 func main() {
 	cfg, showVer := config.Parse()