Skip to content

Commit 9e3dfd4

Browse files
committed
release: Fix build
1 parent 9fca618 commit 9e3dfd4

File tree

3 files changed

+9
-17
lines changed

3 files changed

+9
-17
lines changed

.github/workflows/build.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- name: Calculate version
5656
if: github.event_name != 'workflow_dispatch'
5757
run: |-
58-
go run -v ./cmd/internal/read_tag --nightly
58+
go run -v ./cmd/internal/read_tag --ci --nightly
5959
- name: Set outputs
6060
id: outputs
6161
run: |-
@@ -316,9 +316,9 @@ jobs:
316316
LOCAL_PROPERTIES: ${{ secrets.LOCAL_PROPERTIES }}
317317
- name: Prepare upload
318318
run: |-
319-
mkdir -p dist/release
320-
cp clients/android/app/build/outputs/apk/play/release/*.apk dist/release
321-
cp clients/android/app/build/outputs/apk/other/release/*-universal.apk dist/release
319+
mkdir -p dist
320+
cp clients/android/app/build/outputs/apk/play/release/*.apk dist
321+
cp clients/android/app/build/outputs/apk/other/release/*-universal.apk dist
322322
- name: Upload artifact
323323
uses: actions/upload-artifact@v4
324324
with:
@@ -566,9 +566,9 @@ jobs:
566566
zip -r SFM.dSYMs.zip dSYMs
567567
popd
568568
569-
mkdir -p dist/release
570-
cp clients/apple/SFM.dmg "dist/release/SFM-${VERSION}-universal.dmg"
571-
cp "clients/apple/${{ matrix.archive }}/SFM.dSYMs.zip" "dist/release/SFM-${VERSION}-universal.dSYMs.zip"
569+
mkdir -p dist
570+
cp clients/apple/SFM.dmg "dist/SFM-${VERSION}-universal.dmg"
571+
cp "clients/apple/${{ matrix.archive }}/SFM.dSYMs.zip" "dist/SFM-${VERSION}-universal.dSYMs.zip"
572572
- name: Upload image
573573
if: matrix.if && matrix.name == 'macOS-standalone' && github.event_name == 'workflow_dispatch'
574574
uses: actions/upload-artifact@v4

.github/workflows/linux.yml

+1-9
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,7 @@ jobs:
3434
- name: Calculate version
3535
if: github.event_name != 'workflow_dispatch'
3636
run: |-
37-
go run -v ./cmd/internal/read_tag --nightly
38-
- name: Update version
39-
if: github.event_name == 'workflow_dispatch'
40-
run: |-
41-
go run -v ./cmd/internal/read_tag --nightly
42-
- name: Update nightly version
43-
if: github.event_name != 'workflow_dispatch'
44-
run: |-
45-
go run -v ./cmd/internal/read_tag --nightly
37+
go run -v ./cmd/internal/read_tag --ci --nightly
4638
- name: Set outputs
4739
id: outputs
4840
run: |-

cmd/internal/read_tag/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package main
22

33
import (
44
"flag"
5-
"github.com/sagernet/sing-box/common/badversion"
65
"os"
76

87
"github.com/sagernet/sing-box/cmd/internal/build_shared"
8+
"github.com/sagernet/sing-box/common/badversion"
99
"github.com/sagernet/sing-box/log"
1010
)
1111

0 commit comments

Comments
 (0)