Skip to content

Commit 02b1351

Browse files
hiddify-comhiddify-com
committed
fix: workflow 2
1 parent f5b584b commit 02b1351

File tree

5 files changed

+35
-43
lines changed

5 files changed

+35
-43
lines changed

‎.github/workflows/build.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,12 @@ jobs:
197197
tar -czvf ${{ matrix.job.name }}.tar.gz $files
198198
199199
working-directory: bin
200-
- uses: actions/upload-artifact@v4
201-
if: ${{ success() }}
202-
with:
203-
name: ${{ matrix.job.name }}
204-
path: bin/*.tar.gz
205-
retention-days: 1
200+
# - uses: actions/upload-artifact@v4
201+
# if: ${{ success() }}
202+
# with:
203+
# name: ${{ matrix.job.name }}
204+
# path: bin/*.tar.gz
205+
# retention-days: 1
206206

207207
build-binary:
208208
name: Build binary
@@ -215,7 +215,7 @@ jobs:
215215
CODE_VERSION: "-X github.com/hiddify/hiddify-core/v2/hcommon/constants.Version=${{ needs.calculate_version.outputs.hiddify_version }} -X github.com/sagernet/sing-box/constant.Version=${{ needs.calculate_version.outputs.singbox_version }}"
216216

217217
strategy:
218-
fail-fast: true
218+
fail-fast: false
219219
matrix:
220220
include:
221221
- { os: linux, arch: amd64, variant: purego, naive: true }
@@ -356,7 +356,7 @@ jobs:
356356
set -xeuo pipefail
357357
mkdir -p dist
358358
go build -v -trimpath -o dist/hiddify-core -tags "${BUILD_TAGS}" \
359-
-ldflags '-s -buildid= ${CODE_VERSION} -X internal/godebug.defaultGODEBUG=multipathtcp=0 -checklinkname=0' \
359+
-ldflags "-s -buildid= ${CODE_VERSION} -X internal/godebug.defaultGODEBUG=multipathtcp=0 -checklinkname=0" \
360360
./cmd/main/
361361
env:
362362
CGO_ENABLED: "0"
@@ -378,7 +378,7 @@ jobs:
378378
set -xeuo pipefail
379379
mkdir -p dist
380380
go build -v -trimpath -o dist/hiddify-core -tags "${BUILD_TAGS}" \
381-
-ldflags '-s -buildid= ${CODE_VERSION} -X internal/godebug.defaultGODEBUG=multipathtcp=0 -checklinkname=0' \
381+
-ldflags "-s -buildid= ${CODE_VERSION} -X internal/godebug.defaultGODEBUG=multipathtcp=0 -checklinkname=0" \
382382
./cmd/main/
383383
env:
384384
CGO_ENABLED: "1"
@@ -393,7 +393,7 @@ jobs:
393393
set -xeuo pipefail
394394
mkdir -p dist
395395
go build -v -trimpath -o dist/hiddify-core -tags "${BUILD_TAGS}" \
396-
-ldflags '-s -buildid= ${CODE_VERSION} -X internal/godebug.defaultGODEBUG=multipathtcp=0 -checklinkname=0' \
396+
-ldflags "-s -buildid= ${CODE_VERSION} -X internal/godebug.defaultGODEBUG=multipathtcp=0 -checklinkname=0" \
397397
./cmd/main/
398398
env:
399399
CGO_ENABLED: "1"
@@ -408,7 +408,7 @@ jobs:
408408
set -xeuo pipefail
409409
mkdir -p dist
410410
go build -v -trimpath -o dist/hiddify-core -tags "${BUILD_TAGS}" \
411-
-ldflags '-s -buildid= ${CODE_VERSION} -X internal/godebug.defaultGODEBUG=multipathtcp=0 -checklinkname=0' \
411+
-ldflags "-s -buildid= ${CODE_VERSION} -X internal/godebug.defaultGODEBUG=multipathtcp=0 -checklinkname=0" \
412412
./cmd/main/
413413
env:
414414
CGO_ENABLED: "0"
@@ -428,7 +428,7 @@ jobs:
428428
export CXX="${CC}++"
429429
mkdir -p dist
430430
GOOS=$BUILD_GOOS GOARCH=$BUILD_GOARCH build go build -v -trimpath -o dist/hiddify-core -tags "${BUILD_TAGS}" \
431-
-ldflags '-s -buildid= ${CODE_VERSION} -X internal/godebug.defaultGODEBUG=multipathtcp=0 -checklinkname=0' \
431+
-ldflags "-s -buildid= ${CODE_VERSION} -X internal/godebug.defaultGODEBUG=multipathtcp=0 -checklinkname=0" \
432432
./cmd/main/
433433
env:
434434
CGO_ENABLED: "1"
@@ -538,12 +538,12 @@ jobs:
538538
rm -r "${DIR_NAME}"
539539
- name: Cleanup
540540
run: rm -f dist/hiddify-core dist/libcronet.so
541-
- name: Upload artifact
542-
uses: actions/upload-artifact@v4
543-
with:
544-
name: hiddify-core-${{ matrix.os }}_${{ matrix.arch }}${{ matrix.goarm && format('v{0}', matrix.goarm) }}${{ matrix.go386 && format('_{0}', matrix.go386) }}${{ matrix.gomips && format('_{0}', matrix.gomips) }}${{ matrix.legacy_name && format('-legacy-{0}', matrix.legacy_name) }}${{ matrix.variant && format('-{0}', matrix.variant) }}
545-
path: "dist"
546-
retention-days: 1
541+
# - name: Upload artifact
542+
# uses: actions/upload-artifact@v4
543+
# with:
544+
# name: hiddify-core-${{ matrix.os }}_${{ matrix.arch }}${{ matrix.goarm && format('v{0}', matrix.goarm) }}${{ matrix.go386 && format('_{0}', matrix.go386) }}${{ matrix.gomips && format('_{0}', matrix.gomips) }}${{ matrix.legacy_name && format('-legacy-{0}', matrix.legacy_name) }}${{ matrix.variant && format('-{0}', matrix.variant) }}
545+
# path: "dist"
546+
# retention-days: 1
547547

548548

549549

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ CRONET_GO_VERSION := $(shell cat hiddify-sing-box/.github/CRONET_GO_VERSION)
1414
TAGS=with_gvisor,with_quic,with_wireguard,with_utls,with_clash_api,with_grpc,with_awg,with_naive_outbound,tfogo_checklinkname0
1515
IOS_ADD_TAGS=with_dhcp,with_low_memory,with_conntrack
1616
WINDOWS_ADD_TAGS=with_purego
17-
GOBUILDLIB=CGO_ENABLED=1 go build -trimpath -ldflags="-w -s -checklinkname=0 $${CODE_VERSION}" -buildmode=c-shared
17+
GOBUILDLIB=CGO_ENABLED=1 go build -trimpath -ldflags="-w -s -checklinkname=0 -buildid= $${CODE_VERSION}" -buildmode=c-shared
1818
GOBUILDSRV=CGO_ENABLED=1 go build -ldflags "-s -w $${CODE_VERSION}" -trimpath -tags $(TAGS)
1919

2020
CRONET_DIR=./cronet

‎cmd/main/main.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import (
66
"github.com/hiddify/hiddify-core/cmd"
77
)
88

9-
type UpdateRequest struct {
10-
Description string `json:"description,omitempty"`
11-
PrivatePods bool `json:"private_pods"`
12-
OperatingMode string `json:"operating_mode,omitempty"`
13-
ActivationState string `json:"activation_state,omitempty"`
14-
}
9+
// type UpdateRequest struct {
10+
// Description string `json:"description,omitempty"`
11+
// PrivatePods bool `json:"private_pods"`
12+
// OperatingMode string `json:"operating_mode,omitempty"`
13+
// ActivationState string `json:"activation_state,omitempty"`
14+
// }
1515

1616
func main() {
1717
cmd.ParseCli(os.Args[1:])

‎go.mod‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -265,22 +265,22 @@ require (
265265

266266
// replace github.com/sagernet/sing-box => github.com/hiddify/hiddify-sing-box v1.13.0-rc.2.0.20260209222802-dd10a2129de7
267267

268-
replace github.com/hiddify/ray2sing => ./ray2sing
269-
270-
replace github.com/sagernet/sing-box => ./hiddify-sing-box
271-
272268
// replace github.com/xtls/xray-core => github.com/hiddify/xray-core v0.0.0-20260124181826-59e6569c13e9
273269

274-
replace github.com/sagernet/wireguard-go => github.com/hiddify/wireguard-go v0.0.0-20260207195137-b12022450359
275-
276-
replace github.com/sagernet/tailscale => github.com/hiddify/tailscale v1.92.4-sing-box-1.13-mod.6.0.20260202223641-788aa623edeb
277-
278270
replace github.com/bepass-org/warp-plus => github.com/hiddify/warp-plus v0.0.0-20240717223357-4f3122e0d11d
279271

280272
replace github.com/sagernet/sing-dns => github.com/shtorm-7/sing-dns v0.4.6-extended-1.0.0
281273

282274
replace github.com/ameshkov/dnscrypt/v2 => github.com/shtorm-7/dnscrypt/v2 v2.4.0-extended-1.0.0
283275

284-
replace github.com/Psiphon-Labs/quic-go => github.com/hiddify/psiphon-quic-go v0.0.0-20260205155832-2164d1653824
276+
replace github.com/hiddify/ray2sing => ./ray2sing
277+
278+
replace github.com/sagernet/sing-box => ./hiddify-sing-box
279+
280+
replace github.com/sagernet/wireguard-go => ./hiddify-sing-box/replace/wireguard-go
281+
282+
replace github.com/sagernet/tailscale => ./hiddify-sing-box/replace/tailscale
283+
284+
replace github.com/Psiphon-Labs/quic-go => ./hiddify-sing-box/replace/psiphon-quic-go
285285

286-
replace github.com/Psiphon-Labs/psiphon-tls => github.com/hiddify/psiphon-tls v0.0.0-20260205181946-4af85c2fb9f2
286+
replace github.com/Psiphon-Labs/psiphon-tls => ./hiddify-sing-box/replace/psiphon-tls

‎go.sum‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -358,16 +358,8 @@ github.com/hdevalence/ed25519consensus v0.2.0 h1:37ICyZqdyj0lAZ8P4D1d1id3HqbbG1N
358358
github.com/hdevalence/ed25519consensus v0.2.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo=
359359
github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb h1:PGufWXXDq9yaev6xX1YQauaO1MV90e6Mpoq1I7Lz/VM=
360360
github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb/go.mod h1:QiyDdbZLaJ/mZP4Zwc9g2QsfaEA4o7XvvgZegSci5/E=
361-
github.com/hiddify/psiphon-quic-go v0.0.0-20260205155832-2164d1653824 h1:a5HGC6a/s4SmRvfqsYWBGd6ump3iploFoddqKpIyO7M=
362-
github.com/hiddify/psiphon-quic-go v0.0.0-20260205155832-2164d1653824/go.mod h1:rONdWgPMbFjyyBai7gB1IBF4pT9r4l0GyiDst5XR1SY=
363-
github.com/hiddify/psiphon-tls v0.0.0-20260205181946-4af85c2fb9f2 h1:42YhXZ/qMbWOlH+AE6KZKpv96G60FXMaeQ+TYFUFwNU=
364-
github.com/hiddify/psiphon-tls v0.0.0-20260205181946-4af85c2fb9f2/go.mod h1:7ZUnPnWT5z8J8hxfsVjKHYK77Zme/Y0If1b/zeziiJs=
365-
github.com/hiddify/tailscale v1.92.4-sing-box-1.13-mod.6.0.20260202223641-788aa623edeb h1:eh+X2WCTfbXdNz5A6k44kWkl9KJbKlVQOfkgZjk3eZs=
366-
github.com/hiddify/tailscale v1.92.4-sing-box-1.13-mod.6.0.20260202223641-788aa623edeb/go.mod h1:m87GAn4UcesHQF3leaPFEINZETO5za1LGn1GJdNDgNc=
367361
github.com/hiddify/warp-plus v0.0.0-20240717223357-4f3122e0d11d h1:vRGKh9ou+/vQGfVYa8MczhbIVjHxlP52OWwrDWO77RA=
368362
github.com/hiddify/warp-plus v0.0.0-20240717223357-4f3122e0d11d/go.mod h1:uSRUbr1CcvFrEV69FTvuJFwpzEmwO8N4knb6+Zq3Ys4=
369-
github.com/hiddify/wireguard-go v0.0.0-20260207195137-b12022450359 h1:Y3BZF9JkTfFEccxzO7uTXgDSIOELPNeXCw5hCCxJyJw=
370-
github.com/hiddify/wireguard-go v0.0.0-20260207195137-b12022450359/go.mod h1:hEqi4y5czEg6LYtX2Bpjg+lV0b/J1n+5rA885Z66Mx0=
371363
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
372364
github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
373365
github.com/improbable-eng/grpc-web v0.15.0 h1:BN+7z6uNXZ1tQGcNAuaU1YjsLTApzkjt2tzCixLaUPQ=

0 commit comments

Comments
 (0)