From a9efee57a3f791d5b21049de07b171cb29f08b52 Mon Sep 17 00:00:00 2001 From: parhelia512 <0011d3@gmail.com> Date: Thu, 18 Sep 2025 06:41:06 +0800 Subject: [PATCH] ci: add legacy macos build --- .github/workflows/build.yml | 25 +++++++++++++++++++++++-- script/build_public_res.sh | 11 ----------- script/deploy_macos.sh | 9 +++++++-- 3 files changed, 30 insertions(+), 15 deletions(-) delete mode 100755 script/build_public_res.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d18cdf7..0604a08 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: go_version: "1.25.0" - cross_os: darwin cross_arch: amd64 - go_version: "1.25.0" + go_version: "1.24.7" - cross_os: darwin cross_arch: arm64 go_version: "1.25.0" @@ -106,6 +106,9 @@ jobs: - platform: macos-latest qt_version: "6.9.0" target: arm64 + - platform: macos-latest + qt_version: "6.4.3" + target: x86_64 - platform: windows-latest qt_version: "6.2.12" target: x86_64 @@ -203,7 +206,7 @@ jobs: ./script/deploy_linux64.sh - name: macOS - Generate MakeFile and Build shell: bash - if: matrix.platform == 'macos-latest' + if: matrix.platform == 'macos-latest' && matrix.qt_version != '6.4.3' run: | mkdir build cd build @@ -212,6 +215,17 @@ jobs: ninja cd .. ./script/deploy_macos.sh ${{ matrix.target }} + - name: Legacy macOS - Generate MakeFile and Build + shell: bash + if: matrix.platform == 'macos-latest' && matrix.qt_version == '6.4.3' + run: | + mkdir build + cd build + curl -fLso srslist.h "https://raw.githubusercontent.com/throneproj/routeprofiles/rule-set/srslist.h" + cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DNKR_PACKAGE_MACOS=1 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DCMAKE_OSX_ARCHITECTURES=${{ matrix.target }} .. + ninja + cd .. + ./script/deploy_macos.sh # ========================================================================================================= Deployments - name: Tar files shell: bash @@ -283,6 +297,12 @@ jobs: zip -9 --symlinks -r $version_standalone-macos-amd64.zip Throne rm -rf macos-amd64 rm -rf Throne + #### + mkdir Throne + mv macoslegacy-amd64/Throne.app Throne/Throne.app + zip -9 --symlinks -r $version_standalone-macoslegacy-amd64.zip Throne + rm -rf macoslegacy-amd64 + rm -rf Throne - name: Clean Up run: | cd deployment @@ -294,6 +314,7 @@ jobs: rm -rf windowslegacy64 rm -rf macos-amd64 rm -rf macos-arm64 + rm -rf macoslegacy-amd64 rm -rf *.pdb - name: Uploading Artifact uses: actions/upload-artifact@v4.6.2 diff --git a/script/build_public_res.sh b/script/build_public_res.sh deleted file mode 100755 index 8bf408f..0000000 --- a/script/build_public_res.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -e - -source script/env_deploy.sh -DEST=$DEPLOYMENT/public_res -rm -rf $DEST -mkdir -p $DEST - -#### Download geodata #### -curl -fLso $DEST/geoip.db "https://github.com/SagerNet/sing-geoip/releases/latest/download/geoip.db" -curl -fLso $DEST/geosite.db "https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite.db" diff --git a/script/deploy_macos.sh b/script/deploy_macos.sh index 03805dc..a45b562 100755 --- a/script/deploy_macos.sh +++ b/script/deploy_macos.sh @@ -1,14 +1,19 @@ #!/bin/bash set -e +source script/env_deploy.sh if [[ $1 == 'arm64' ]]; then ARCH="arm64" + DEST=$DEPLOYMENT/macos-arm64 else ARCH="amd64" + if [[ $1 == 'x86_64' ]]; then + DEST=$DEPLOYMENT/macos-amd64 + else + DEST=$DEPLOYMENT/macoslegacy-amd64 + fi fi -source script/env_deploy.sh -DEST=$DEPLOYMENT/macos-$ARCH rm -rf $DEST mkdir -p $DEST