From 106b51b66367d395ed35c2acd26ea0e724c06c1f Mon Sep 17 00:00:00 2001 From: Reverier-Xu Date: Tue, 28 May 2024 15:56:27 +0800 Subject: [PATCH] :tada: 0.2.10 --- .github/workflows/release.yml | 24 ------------------------ deploy_macos.sh | 5 +++-- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b657eca..6a21ab8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -111,13 +111,6 @@ jobs: - name: Deploy application run: ./deploy_macos.sh -c -p - # Upload application ZIP - - name: Upload application ZIP - uses: actions/upload-artifact@v4 - with: - name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS-x86_64.zip - path: ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS-x86_64.zip - # Upload application DMG - name: Upload application DMG uses: actions/upload-artifact@v4 @@ -130,7 +123,6 @@ jobs: if: startsWith(github.ref, 'refs/tags/') with: files: | - ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS-x86_64.zip ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS-x86_64.dmg ## macOS build ############################################################### @@ -171,13 +163,6 @@ jobs: - name: Deploy application run: ./deploy_macos.sh -c -p - # Upload application ZIP - - name: Upload application ZIP - uses: actions/upload-artifact@v4 - with: - name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS-arm64.zip - path: ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS-arm64.zip - # Upload application DMG - name: Upload application DMG uses: actions/upload-artifact@v4 @@ -190,7 +175,6 @@ jobs: if: startsWith(github.ref, 'refs/tags/') with: files: | - ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS-arm64.zip ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS-arm64.dmg ## Windows build ############################################################# @@ -240,13 +224,6 @@ jobs: - name: Deploy application run: sh deploy_windows.sh -c -p - # Upload application ZIP - - name: Upload application ZIP - uses: actions/upload-artifact@v4 - with: - name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-win64.zip - path: ${{env.APP_NAME}}-${{env.APP_VERSION}}-win64.zip - # Upload NSIS installer - name: Upload NSIS installer uses: actions/upload-artifact@v4 @@ -260,4 +237,3 @@ jobs: with: files: | ${{env.APP_NAME}}-${{env.APP_VERSION}}-win64.exe - ${{env.APP_NAME}}-${{env.APP_VERSION}}-win64.zip diff --git a/deploy_macos.sh b/deploy_macos.sh index 2225e16..471e107 100755 --- a/deploy_macos.sh +++ b/deploy_macos.sh @@ -24,7 +24,8 @@ strip build/bin/wsrx cp build/bin/wsrx build/bin/wsrx-desktop.app/Contents/MacOS/wsrx cp -r build/bin/wsrx-desktop.app $APP_NAME.app macdeployqt $APP_NAME.app -qmldir=./desktop/components -qmldir=./desktop/ui -hardened-runtime -timestamp -find $APP_NAME.app/ -name "*.dSYM"|xargs rm -rf -hdiutil create $APP_NAME-tmp.dmg -ov -volname "WebSocketReflectorX" -fs HFS+ -srcfolder ./$APP_NAME.app +find $APP_NAME.app/ -name "*.dSYM" | xargs rm -rf +sleep 3 +hdiutil create $APP_NAME-tmp.dmg -ov -volname $APP_NAME -fs HFS+ -srcfolder ./$APP_NAME.app hdiutil convert $APP_NAME-tmp.dmg -format UDZO -o $APP_NAME.dmg mv $APP_NAME.dmg $APP_NAME-$APP_VERSION-macOS-$CPU_ARCH.dmg