From 9e3dfd4d70745ca501353badb9c129ea64ae3518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Tue, 25 Mar 2025 18:30:15 +0800 Subject: [PATCH] release: Fix build --- .github/workflows/build.yml | 14 +++++++------- .github/workflows/linux.yml | 10 +--------- cmd/internal/read_tag/main.go | 2 +- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b912f961..e2a49542 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,7 +55,7 @@ jobs: - name: Calculate version if: github.event_name != 'workflow_dispatch' run: |- - go run -v ./cmd/internal/read_tag --nightly + go run -v ./cmd/internal/read_tag --ci --nightly - name: Set outputs id: outputs run: |- @@ -316,9 +316,9 @@ jobs: LOCAL_PROPERTIES: ${{ secrets.LOCAL_PROPERTIES }} - name: Prepare upload run: |- - mkdir -p dist/release - cp clients/android/app/build/outputs/apk/play/release/*.apk dist/release - cp clients/android/app/build/outputs/apk/other/release/*-universal.apk dist/release + mkdir -p dist + cp clients/android/app/build/outputs/apk/play/release/*.apk dist + cp clients/android/app/build/outputs/apk/other/release/*-universal.apk dist - name: Upload artifact uses: actions/upload-artifact@v4 with: @@ -566,9 +566,9 @@ jobs: zip -r SFM.dSYMs.zip dSYMs popd - mkdir -p dist/release - cp clients/apple/SFM.dmg "dist/release/SFM-${VERSION}-universal.dmg" - cp "clients/apple/${{ matrix.archive }}/SFM.dSYMs.zip" "dist/release/SFM-${VERSION}-universal.dSYMs.zip" + mkdir -p dist + cp clients/apple/SFM.dmg "dist/SFM-${VERSION}-universal.dmg" + cp "clients/apple/${{ matrix.archive }}/SFM.dSYMs.zip" "dist/SFM-${VERSION}-universal.dSYMs.zip" - name: Upload image if: matrix.if && matrix.name == 'macOS-standalone' && github.event_name == 'workflow_dispatch' uses: actions/upload-artifact@v4 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a48854d5..84245b5d 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -34,15 +34,7 @@ jobs: - name: Calculate version if: github.event_name != 'workflow_dispatch' run: |- - go run -v ./cmd/internal/read_tag --nightly - - name: Update version - if: github.event_name == 'workflow_dispatch' - run: |- - go run -v ./cmd/internal/read_tag --nightly - - name: Update nightly version - if: github.event_name != 'workflow_dispatch' - run: |- - go run -v ./cmd/internal/read_tag --nightly + go run -v ./cmd/internal/read_tag --ci --nightly - name: Set outputs id: outputs run: |- diff --git a/cmd/internal/read_tag/main.go b/cmd/internal/read_tag/main.go index e082e130..0f426332 100644 --- a/cmd/internal/read_tag/main.go +++ b/cmd/internal/read_tag/main.go @@ -2,10 +2,10 @@ package main import ( "flag" - "github.com/sagernet/sing-box/common/badversion" "os" "github.com/sagernet/sing-box/cmd/internal/build_shared" + "github.com/sagernet/sing-box/common/badversion" "github.com/sagernet/sing-box/log" )