From 58821f260383c80d7f826ee1f64284b25941a341 Mon Sep 17 00:00:00 2001 From: spiritlhl <103393591+spiritLHLS@users.noreply.github.com> Date: Thu, 17 Jul 2025 15:27:58 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20darwin=E5=8E=BB=E9=99=A4CGO=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E9=9C=80=E6=B1=82=EF=BC=8C=E4=B8=8D=E5=86=8D=E4=BD=BF?= =?UTF-8?q?=E7=94=A8CGO=E8=BF=9B=E8=A1=8C=E7=BC=96=E8=AF=91(=E9=83=A8?= =?UTF-8?q?=E5=88=86linux=E7=9A=84C=E4=BB=A3=E7=A0=81=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E8=BF=81=E7=A7=BB)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build_binary.yaml | 36 ++++++++++++++--------------- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build_binary.yaml b/.github/workflows/build_binary.yaml index 53e68f4d..7b1e17c6 100644 --- a/.github/workflows/build_binary.yaml +++ b/.github/workflows/build_binary.yaml @@ -151,21 +151,21 @@ jobs: - goos: darwin goarch: amd64 - cgo_enabled: "1" - cc: "clang --target=x86_64-apple-darwin" - cflags: "-O2 -arch x86_64 -mmacosx-version-min=10.12" + cgo_enabled: "0" + # cc: "clang --target=x86_64-apple-darwin" + # cflags: "-O2 -arch x86_64 -mmacosx-version-min=10.12" ldflags: "-s -w" runner: ubuntu-latest - requires_osxcross: true + # requires_osxcross: true - goos: darwin goarch: arm64 - cgo_enabled: "1" - cc: "clang --target=aarch64-apple-darwin" - cflags: "-O2 -arch arm64 -mmacosx-version-min=11.0" + cgo_enabled: "0" + # cc: "clang --target=aarch64-apple-darwin" + # cflags: "-O2 -arch arm64 -mmacosx-version-min=11.0" ldflags: "-s -w" runner: ubuntu-latest - requires_osxcross: true + # requires_osxcross: true - goos: linux goarch: arm @@ -257,16 +257,16 @@ jobs: sudo apt-get install -y build-essential ;; esac - - name: Install osxcross for Darwin - if: matrix.requires_osxcross == true - run: | - git clone --depth=1 https://github.com/tpoechtrager/osxcross.git - cd osxcross - wget -nc https://github.com/joseluisq/macosx-sdks/releases/download/12.3/MacOSX12.3.sdk.tar.xz - mv MacOSX12.3.sdk.tar.xz tarballs/ - UNATTENDED=yes OSX_VERSION_MIN=10.12 ./build.sh - echo "$PWD/target/bin" >> $GITHUB_PATH - echo "OSXCROSS_ROOT=$PWD" >> $GITHUB_ENV + # - name: Install osxcross for Darwin + # if: matrix.requires_osxcross == true + # run: | + # git clone --depth=1 https://github.com/tpoechtrager/osxcross.git + # cd osxcross + # wget -nc https://github.com/joseluisq/macosx-sdks/releases/download/12.3/MacOSX12.3.sdk.tar.xz + # mv MacOSX12.3.sdk.tar.xz tarballs/ + # UNATTENDED=yes OSX_VERSION_MIN=10.12 ./build.sh + # echo "$PWD/target/bin" >> $GITHUB_PATH + # echo "OSXCROSS_ROOT=$PWD" >> $GITHUB_ENV - name: Get latest tag id: tag diff --git a/go.mod b/go.mod index bf2c9f5c..96437edd 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/oneclickvirt/defaultset v0.0.2-20240624082446 github.com/oneclickvirt/disktest v0.0.8-20250701092629 github.com/oneclickvirt/gostun v0.0.3-20250329105202 - github.com/oneclickvirt/memorytest v0.0.8-20250717053253 + github.com/oneclickvirt/memorytest v0.0.8-20250717152547 github.com/oneclickvirt/nt3 v0.0.5-20250416131047 github.com/oneclickvirt/pingtest v0.0.8-20250701125637 github.com/oneclickvirt/portchecker v0.0.3-20250329125750 diff --git a/go.sum b/go.sum index 6890ee4c..d32f4dd6 100644 --- a/go.sum +++ b/go.sum @@ -119,8 +119,8 @@ github.com/oneclickvirt/gostun v0.0.3-20250329105202 h1:aJ6E91Lp94lq8iWRcCaxpXTj github.com/oneclickvirt/gostun v0.0.3-20250329105202/go.mod h1:f7DPEXAxbmwXSW33dbxtb0/KzqvOBWhTs2Or5xBerQA= github.com/oneclickvirt/mbw v0.0.1-20250630140849 h1:p6RMhOPBnQKAm9+VEQ2axAFsidrdSdrhXMyheIyv2a8= github.com/oneclickvirt/mbw v0.0.1-20250630140849/go.mod h1:0Vq6NRpyLmGUdfHfL3uDcFsuZhi7KlG+OCs5ky2757Y= -github.com/oneclickvirt/memorytest v0.0.8-20250717053253 h1:Q5dsDgtQQljcsphSIA5atJV+UpLUdHI/q5Yyzq4mPb8= -github.com/oneclickvirt/memorytest v0.0.8-20250717053253/go.mod h1:7xMacjQobvFAtODht2hxTsB9hM2IFS7vZk3gxx+bsjo= +github.com/oneclickvirt/memorytest v0.0.8-20250717152547 h1:V4n4kkIizrHPpCwU2OECv8wUw4VcwRxZpATDDg9j8dI= +github.com/oneclickvirt/memorytest v0.0.8-20250717152547/go.mod h1:7xMacjQobvFAtODht2hxTsB9hM2IFS7vZk3gxx+bsjo= github.com/oneclickvirt/nt3 v0.0.5-20250416131047 h1:KL0xowq19cW+FMBGMJxdqpRNoeyR+eEmb+jYSubmlTk= github.com/oneclickvirt/nt3 v0.0.5-20250416131047/go.mod h1:CVsDJEaIdyyZHn3WKbhU8Wn6GOfmBNvJlC/dDLRqcSQ= github.com/oneclickvirt/pingtest v0.0.8-20250701125637 h1:J28Ai5miTq1J0I4gdT8rewJSd3LwzD90L/bNiiaKfHM=