From cd1003cbeba15ffbfbe1e88d6897f493cae4aeeb Mon Sep 17 00:00:00 2001 From: Hiddify Date: Fri, 2 Feb 2024 16:15:21 +0100 Subject: [PATCH] fix: more release bug --- .github/workflows/release.yml | 6 ++++-- Makefile | 9 ++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fa30902..6dad97d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -79,9 +79,11 @@ jobs: -o \ -name 'Libcore.xcframework' \ -o \ - -name 'hiddify-service*' ) + -name 'hiddify-service*' | sed 's/\.\///g') - tar -czvf hiddify-core-${{ matrix.job.target }}.tar.gz --transform='s,^./,,g' $files + + echo tar -czvf hiddify-core-${{ matrix.job.target }}.tar.gz $files + tar -czvf hiddify-core-${{ matrix.job.target }}.tar.gz $files working-directory: bin - uses: actions/upload-artifact@v3 diff --git a/Makefile b/Makefile index e283f40..9ad0e60 100644 --- a/Makefile +++ b/Makefile @@ -24,14 +24,13 @@ android: lib_install gomobile bind -v -androidapi=21 -javapkg=io.nekohasekai -libname=box -tags=$(TAGS) -trimpath -target=android -o $(BINDIR)/$(LIBNAME).aar github.com/sagernet/sing-box/experimental/libbox ./mobile ios-full: lib_install - gomobile bind -v -target ios,iossimulator,tvos,tvossimulator,macos -libname=box -tags=$(TAGS),with_dhcp,with_low_memory,with_conntrack -trimpath -ldflags="-w -s" -o $(BINDIR)/$(PRODUCT_NAME).xcframework github.com/sagernet/sing-box/experimental/libbox ./mobile &&\ - mv $(BINDIR)/$(PRODUCT_NAME).xcframework $(BINDIR)/$(LIBNAME).xcframework &&\ + gomobile bind -v -target ios,iossimulator,tvos,tvossimulator,macos -libname=box -tags=$(TAGS),with_dhcp,with_low_memory,with_conntrack -trimpath -ldflags="-w -s" -o $(BINDIR)/$(PRODUCT_NAME).xcframework github.com/sagernet/sing-box/experimental/libbox ./mobile + mv $(BINDIR)/$(PRODUCT_NAME).xcframework $(BINDIR)/$(LIBNAME).xcframework cp Libcore.podspec $(BINDIR)/$(LIBNAME).xcframework/ ios: lib_install - gomobile bind -v -target ios -libname=box -tags=$(TAGS),with_dhcp,with_low_memory,with_conntrack -trimpath -ldflags="-w -s" -o $(BINDIR)/$(PRODUCT_NAME).xcframework github.com/sagernet/sing-box/experimental/libbox ./mobile &&\ - mv $(BINDIR)/$(PRODUCT_NAME).xcframework $(BINDIR)/$(LIBNAME).xcframework &&\ - cp Info.plist $(BINDIR)/$(LIBNAME).xcframework/ + gomobile bind -v -target ios -libname=box -tags=$(TAGS),with_dhcp,with_low_memory,with_conntrack -trimpath -ldflags="-w -s" -o $(BINDIR)/Libcore.xcframework github.com/sagernet/sing-box/experimental/libbox ./mobile + cp Info.plist $(BINDIR)/Libcore.xcframework/