From 07ee9612755f388c820d52b3affa7d873e735271 Mon Sep 17 00:00:00 2001 From: parhelia512 <0011d3@gmail.com> Date: Sat, 13 Dec 2025 00:04:27 +0800 Subject: [PATCH] update go for macoslegacy --- .github/workflows/build.yml | 11 +++++++---- script/build_go.sh | 15 ++++++++++----- script/deploy_macos.sh | 9 ++++----- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae695ba..5012bc6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,10 +29,13 @@ jobs: go_version: "1.25.5" - cross_os: darwin cross_arch: amd64 - go_version: "1.24.11" + go_version: "1.25.5" - cross_os: darwin cross_arch: arm64 go_version: "1.25.5" + - cross_os: darwin-legacy + cross_arch: amd64 + go_version: "1.25.5" - cross_os: windowslegacy cross_arch: amd64 go_version: "1.25.5" @@ -349,9 +352,9 @@ jobs: rm -rf Throne #### mkdir Throne - mv macoslegacy-amd64/Throne.app Throne/Throne.app + mv macos-legacy-amd64/Throne.app Throne/Throne.app zip -9 --symlinks -r $version_standalone-macoslegacy-amd64.zip Throne - rm -rf macoslegacy-amd64 + rm -rf macos-legacy-amd64 rm -rf Throne - name: Clean Up run: | @@ -364,7 +367,7 @@ jobs: rm -rf windowslegacy64 rm -rf macos-amd64 rm -rf macos-arm64 - rm -rf macoslegacy-amd64 + rm -rf macos-legacy-amd64 rm -rf *.pdb - name: Uploading Artifact uses: actions/upload-artifact@v4.6.2 diff --git a/script/build_go.sh b/script/build_go.sh index 16839cd..89f68f8 100755 --- a/script/build_go.sh +++ b/script/build_go.sh @@ -10,13 +10,18 @@ source script/env_deploy.sh [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/macos-amd64 || true [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/macos-arm64 || true -if [[ "$GOOS" == "windowslegacy" ]]; then - GOOS="windows" +if [[ "$GOOS" =~ legacy$ ]]; then GOCMD="$PWD/go/bin/go" - if [[ $GOARCH == 'amd64' ]]; then - DEST=$DEPLOYMENT/windowslegacy64 + if [[ "$GOOS" == "windowslegacy" ]]; then + GOOS="windows" + if [[ $GOARCH == 'amd64' ]]; then + DEST=$DEPLOYMENT/windowslegacy64 + else + DEST=$DEPLOYMENT/windows32 + fi else - DEST=$DEPLOYMENT/windows32 + GOOS="darwin" + DEST=$DEPLOYMENT/macos-legacy-amd64 fi else GOCMD="go" diff --git a/script/deploy_macos.sh b/script/deploy_macos.sh index a45b562..e4fafa3 100755 --- a/script/deploy_macos.sh +++ b/script/deploy_macos.sh @@ -4,15 +4,14 @@ 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 + ARCH="amd64" else - DEST=$DEPLOYMENT/macoslegacy-amd64 + ARCH="legacy-amd64" fi fi +DEST=$DEPLOYMENT/macos-$ARCH rm -rf $DEST mkdir -p $DEST @@ -25,7 +24,7 @@ cd ../.. mv deployment/macos-$ARCH/* $BUILD/Throne.app/Contents/MacOS -#### deploy qt & DLL runtime => .app #### +#### deploy qt & Dylib runtime => .app #### pushd $BUILD macdeployqt Throne.app -verbose=3 popd