From 4e7fe336554e87880be08fddbfc778cfc5f6b9f1 Mon Sep 17 00:00:00 2001 From: Hiddify <114227601+hiddify-com@users.noreply.github.com> Date: Mon, 21 Apr 2025 12:37:11 +0200 Subject: [PATCH 1/4] Update LICENSE.md --- LICENSE.md | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 3110493b..529ef62e 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -9,19 +9,11 @@ Additional Permissions and Restrictions Under GNU GPL Version 3 Section 7 - Any forks should be published open-source under the same license. -- Prior consent is required to publish a fork or utilize any part of this repository (github.com/hiddify/hiddify-next and github.com/hiddify/hiddify-next-core) in an application intended for publication on the App Store or for iOS/macOS platforms. (We reserve the right to modify this requirement in the future after completing development for iOS and macOS). -- You need prior consent to publish a fork or use any part of this code in an application published in AppStore or publish for iOS or macOS. (We reserve the right to modify this requirement in the future after completing development for iOS and macOS). -- You are free to: - - Share — copy and redistribute the material in any medium or format with - - Adapt — remix, transform, and build upon the material -- Under the following terms: - - Attribution — You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use. - - - NonCommercial — You may not use the material for commercial purposes. You can not even include ads in it. +— You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use. + +- NonCommercial — You may not use the material for commercial purposes. You can not even include ads in it. - - ShareAlike — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original. - - - Prior consent is required before utilizing any portion of this code for integration into an application intended for the App Store. +- ShareAlike — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original. GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 From 393d5d291e7988aec1d097054063f10b76e37933 Mon Sep 17 00:00:00 2001 From: hiddify <114227601+hiddify-com@users.noreply.github.com> Date: Mon, 21 Apr 2025 11:25:14 +0200 Subject: [PATCH 2/4] update linux build --- .github/workflows/build.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4afb0db7..6a3382cd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,25 +43,25 @@ jobs: matrix: job: - { name: 'hiddify-core-android', os: 'ubuntu-latest', target: 'android' } - - { name: 'hiddify-core-linux-amd64', os: 'ubuntu-20.04', target: 'linux-amd64' } + - { name: 'hiddify-core-linux-amd64', os: 'ubuntu-22.04', target: 'linux-amd64' } - { name: "hiddify-core-windows-amd64", os: 'ubuntu-latest', target: 'windows-amd64', aarch: 'x64' } - { name: "hiddify-core-macos-universal", os: 'macos-12', target: 'macos-universal' } - { name: "hiddify-core-ios", os: "macos-12", target: "ios" } # linux custom - - {name: hiddify-cli-linux-amd64, goos: linux, goarch: amd64, goamd64: v1, target: 'linux-custom', os: 'ubuntu-20.04'} - - {name: hiddify-cli-linux-amd64-v3, goos: linux, goarch: amd64, goamd64: v3, target: 'linux-custom', os: 'ubuntu-20.04'} - - {name: hiddify-cli-linux-386, goos: linux, goarch: 386, target: 'linux-custom', os: 'ubuntu-20.04'} - - {name: hiddify-cli-linux-arm64, goos: linux, goarch: arm64, target: 'linux-custom', os: 'ubuntu-20.04'} - - {name: hiddify-cli-linux-armv5, goos: linux, goarch: arm, goarm: 5, target: 'linux-custom', os: 'ubuntu-20.04'} - - {name: hiddify-cli-linux-armv6, goos: linux, goarch: arm, goarm: 6, target: 'linux-custom', os: 'ubuntu-20.04'} - - {name: hiddify-cli-linux-armv7, goos: linux, goarch: arm, goarm: 7, target: 'linux-custom', os: 'ubuntu-20.04'} - - {name: hiddify-cli-linux-mips-softfloat, goos: linux, goarch: mips, gomips: softfloat, target: 'linux-custom', os: 'ubuntu-20.04'} - - {name: hiddify-cli-linux-mips-hardfloat, goos: linux, goarch: mips, gomips: hardfloat, target: 'linux-custom', os: 'ubuntu-20.04'} - - {name: hiddify-cli-linux-mipsel-softfloat, goos: linux, goarch: mipsle, gomips: softfloat, target: 'linux-custom', os: 'ubuntu-20.04'} - - {name: hiddify-cli-linux-mipsel-hardfloat, goos: linux, goarch: mipsle, gomips: hardfloat, target: 'linux-custom', os: 'ubuntu-20.04'} - - {name: hiddify-cli-linux-mips64, goos: linux, goarch: mips64, target: 'linux-custom', os: 'ubuntu-20.04'} - - {name: hiddify-cli-linux-mips64el, goos: linux, goarch: mips64le, target: 'linux-custom', os: 'ubuntu-20.04'} - - {name: hiddify-cli-linux-s390x, goos: linux, goarch: s390x, target: 'linux-custom', os: 'ubuntu-20.04'} + - {name: hiddify-cli-linux-amd64, goos: linux, goarch: amd64, goamd64: v1, target: 'linux-custom', os: 'ubuntu-22.04'} + - {name: hiddify-cli-linux-amd64-v3, goos: linux, goarch: amd64, goamd64: v3, target: 'linux-custom', os: 'ubuntu-22.04'} + - {name: hiddify-cli-linux-386, goos: linux, goarch: 386, target: 'linux-custom', os: 'ubuntu-22.04'} + - {name: hiddify-cli-linux-arm64, goos: linux, goarch: arm64, target: 'linux-custom', os: 'ubuntu-22.04'} + - {name: hiddify-cli-linux-armv5, goos: linux, goarch: arm, goarm: 5, target: 'linux-custom', os: 'ubuntu-22.04'} + - {name: hiddify-cli-linux-armv6, goos: linux, goarch: arm, goarm: 6, target: 'linux-custom', os: 'ubuntu-22.04'} + - {name: hiddify-cli-linux-armv7, goos: linux, goarch: arm, goarm: 7, target: 'linux-custom', os: 'ubuntu-22.04'} + - {name: hiddify-cli-linux-mips-softfloat, goos: linux, goarch: mips, gomips: softfloat, target: 'linux-custom', os: 'ubuntu-22.04'} + - {name: hiddify-cli-linux-mips-hardfloat, goos: linux, goarch: mips, gomips: hardfloat, target: 'linux-custom', os: 'ubuntu-22.04'} + - {name: hiddify-cli-linux-mipsel-softfloat, goos: linux, goarch: mipsle, gomips: softfloat, target: 'linux-custom', os: 'ubuntu-22.04'} + - {name: hiddify-cli-linux-mipsel-hardfloat, goos: linux, goarch: mipsle, gomips: hardfloat, target: 'linux-custom', os: 'ubuntu-22.04'} + - {name: hiddify-cli-linux-mips64, goos: linux, goarch: mips64, target: 'linux-custom', os: 'ubuntu-22.04'} + - {name: hiddify-cli-linux-mips64el, goos: linux, goarch: mips64le, target: 'linux-custom', os: 'ubuntu-22.04'} + - {name: hiddify-cli-linux-s390x, goos: linux, goarch: s390x, target: 'linux-custom', os: 'ubuntu-22.04'} runs-on: ${{ matrix.job.os }} env: From bcc664d91be60a314d1fa11ea46d7af7cbba0bf0 Mon Sep 17 00:00:00 2001 From: Aleksey Komarov Date: Fri, 25 Apr 2025 08:48:11 +0300 Subject: [PATCH 3/4] update macos build --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a3382cd..6193e1e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,8 +45,8 @@ jobs: - { name: 'hiddify-core-android', os: 'ubuntu-latest', target: 'android' } - { name: 'hiddify-core-linux-amd64', os: 'ubuntu-22.04', target: 'linux-amd64' } - { name: "hiddify-core-windows-amd64", os: 'ubuntu-latest', target: 'windows-amd64', aarch: 'x64' } - - { name: "hiddify-core-macos-universal", os: 'macos-12', target: 'macos-universal' } - - { name: "hiddify-core-ios", os: "macos-12", target: "ios" } + - { name: "hiddify-core-macos-universal", os: 'macos-13', target: 'macos-universal' } + - { name: "hiddify-core-ios", os: "macos-13", target: "ios" } # linux custom - {name: hiddify-cli-linux-amd64, goos: linux, goarch: amd64, goamd64: v1, target: 'linux-custom', os: 'ubuntu-22.04'} - {name: hiddify-cli-linux-amd64-v3, goos: linux, goarch: amd64, goamd64: v3, target: 'linux-custom', os: 'ubuntu-22.04'} From ddb1715a53982770d3d56771d94f71ae26853359 Mon Sep 17 00:00:00 2001 From: Aleksey Komarov Date: Thu, 20 Feb 2025 07:31:56 +0300 Subject: [PATCH 4/4] add CI for arm64 Linux build --- .github/workflows/build.yml | 1 + Makefile | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6193e1e5..f7d706fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,6 +44,7 @@ jobs: job: - { name: 'hiddify-core-android', os: 'ubuntu-latest', target: 'android' } - { name: 'hiddify-core-linux-amd64', os: 'ubuntu-22.04', target: 'linux-amd64' } + - { name: 'hiddify-core-linux-arm64', os: 'ubuntu-22.04-arm', target: 'linux-arm64' } - { name: "hiddify-core-windows-amd64", os: 'ubuntu-latest', target: 'windows-amd64', aarch: 'x64' } - { name: "hiddify-core-macos-universal", os: 'macos-13', target: 'macos-universal' } - { name: "hiddify-core-ios", os: "macos-13", target: "ios" } diff --git a/Makefile b/Makefile index 45213b0d..94716eb1 100644 --- a/Makefile +++ b/Makefile @@ -73,6 +73,15 @@ linux-amd64: rm -rf ./lib chmod +x $(BINDIR)/$(CLINAME) make webui +linux-arm64: + mkdir -p $(BINDIR)/lib + env GOOS=linux GOARCH=arm64 $(GOBUILDLIB) -o $(BINDIR)/lib/$(LIBNAME).so ./custom + mkdir lib + cp $(BINDIR)/lib/$(LIBNAME).so ./lib/$(LIBNAME).so + env GOOS=linux GOARCH=arm64 CGO_LDFLAGS="./lib/$(LIBNAME).so" $(GOBUILDSRV) -o $(BINDIR)/$(CLINAME) ./cli/bydll + rm -rf ./lib + chmod +x $(BINDIR)/$(CLINAME) + make webui linux-custom: