From eaab2d8c1c960b236d562f30c1fc5f05e7123a3e Mon Sep 17 00:00:00 2001 From: Adithya Vardhan Date: Tue, 22 Oct 2024 20:10:35 +0530 Subject: [PATCH] chore: use proper title in wails (#662) --- .github/workflows/create-release.yaml | 2 +- .github/workflows/wails.yml | 46 +++++++++++++++++---------- build/darwin/gon-notarize.json | 8 ----- wails.json | 8 +++-- wails/wails_app.go | 4 +-- 5 files changed, 39 insertions(+), 29 deletions(-) delete mode 100644 build/darwin/gon-notarize.json diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml index 77e36856..92ac133f 100644 --- a/.github/workflows/create-release.yaml +++ b/.github/workflows/create-release.yaml @@ -10,7 +10,7 @@ jobs: release: runs-on: ubuntu-latest steps: - - name: Download Linux server archives + - name: Download server archives uses: actions/download-artifact@v4 with: pattern: albyhub-Server-* diff --git a/.github/workflows/wails.yml b/.github/workflows/wails.yml index a3ad5077..da02c204 100644 --- a/.github/workflows/wails.yml +++ b/.github/workflows/wails.yml @@ -42,7 +42,7 @@ jobs: - name: Setup shell: bash run: | - echo "EXEC_NAME=albyhub" >> $GITHUB_ENV + echo "EXEC_NAME=Alby Hub" >> $GITHUB_ENV echo "PACKAGE_NAME=albyhub-Desktop-${{ runner.os }}" >> $GITHUB_ENV - uses: actions/checkout@v4 @@ -105,17 +105,17 @@ jobs: - name: Build App if: runner.os == 'macOS' - run: wails build --platform darwin/universal -webview2 embed -o ${{ env.EXEC_NAME }} -tags "wails" -ldflags "-X 'github.com/getAlby/hub/version.Tag=${{ env.TAG }}'" + run: wails build --platform darwin/universal -webview2 embed -o "${{ env.EXEC_NAME }}" -tags "wails" -ldflags "-X 'github.com/getAlby/hub/version.Tag=${{ env.TAG }}'" shell: bash - name: Build App if: runner.os == 'Linux' - run: wails build --platform linux/amd64 -webview2 embed -o ${{ env.EXEC_NAME }} -tags "wails" -ldflags "-X 'github.com/getAlby/hub/version.Tag=${{ env.TAG }}'" + run: wails build --platform linux/amd64 -webview2 embed -o "${{ env.EXEC_NAME }}" -tags "wails" -ldflags "-X 'github.com/getAlby/hub/version.Tag=${{ env.TAG }}'" shell: bash - name: Build Windows App if: runner.os == 'Windows' - run: wails build --platform windows/amd64 -webview2 embed -o ${{ env.EXEC_NAME }}.exe -tags "wails" -ldflags "-X 'github.com/getAlby/hub/version.Tag=${{ env.TAG }}'" + run: wails build --platform windows/amd64 -webview2 embed -o "${{ env.EXEC_NAME }}.exe" -tags "wails" -ldflags "-X 'github.com/getAlby/hub/version.Tag=${{ env.TAG }}'" shell: bash - name: Import Code-Signing Certificates for macOS @@ -143,36 +143,36 @@ jobs: cp `go list -m -f "{{.Dir}}" github.com/getAlby/glalby-go`/glalby/x86_64-unknown-linux-gnu/libglalby_bindings.so ./build/bin/${{ env.PACKAGE_NAME }}/lib/ cp `go list -m -f "{{.Dir}}" github.com/getAlby/ldk-node-go`/ldk_node/x86_64-unknown-linux-gnu/libldk_node.so ./build/bin/${{ env.PACKAGE_NAME }}/lib/ mkdir -p ./build/bin/${{ env.PACKAGE_NAME }}/bin - mv ./build/bin/${{ env.EXEC_NAME }} ./build/bin/${{ env.PACKAGE_NAME }}/bin/ + mv "./build/bin/${{ env.EXEC_NAME }}" ./build/bin/${{ env.PACKAGE_NAME }}/bin/ shell: bash - name: Patch executable RPATH if: runner.os == 'Linux' run: | - patchelf --force-rpath --set-rpath '$ORIGIN/../lib' ./build/bin/${{ env.PACKAGE_NAME }}/bin/${{ env.EXEC_NAME }} + patchelf --force-rpath --set-rpath '$ORIGIN/../lib' "./build/bin/${{ env.PACKAGE_NAME }}/bin/${{ env.EXEC_NAME }}" - name: Copy shared libraries to the output directory if: runner.os == 'macOS' run: | - mkdir -p ./build/bin/${{ env.EXEC_NAME }}.app/Contents/Frameworks - lipo -create -output ./build/bin/${{ env.EXEC_NAME }}.app/Contents/Frameworks/libbreez_sdk_bindings.dylib `go list -m -f "{{.Dir}}" github.com/breez/breez-sdk-go`/breez_sdk/lib/darwin-aarch64/libbreez_sdk_bindings.dylib `go list -m -f "{{.Dir}}" github.com/breez/breez-sdk-go`/breez_sdk/lib/darwin-amd64/libbreez_sdk_bindings.dylib - cp `go list -m -f "{{.Dir}}" github.com/getAlby/glalby-go`/glalby/universal-macos/libglalby_bindings.dylib ./build/bin/${{ env.EXEC_NAME }}.app/Contents/Frameworks/ - cp `go list -m -f "{{.Dir}}" github.com/getAlby/ldk-node-go`/ldk_node/universal-macos/libldk_node.dylib ./build/bin/${{ env.EXEC_NAME }}.app/Contents/Frameworks/ + mkdir -p "./build/bin/${{ env.EXEC_NAME }}.app/Contents/Frameworks" + lipo -create -output "./build/bin/${{ env.EXEC_NAME }}.app/Contents/Frameworks/libbreez_sdk_bindings.dylib" `go list -m -f "{{.Dir}}" github.com/breez/breez-sdk-go`/breez_sdk/lib/darwin-aarch64/libbreez_sdk_bindings.dylib `go list -m -f "{{.Dir}}" github.com/breez/breez-sdk-go`/breez_sdk/lib/darwin-amd64/libbreez_sdk_bindings.dylib + cp `go list -m -f "{{.Dir}}" github.com/getAlby/glalby-go`/glalby/universal-macos/libglalby_bindings.dylib "./build/bin/${{ env.EXEC_NAME }}.app/Contents/Frameworks/" + cp `go list -m -f "{{.Dir}}" github.com/getAlby/ldk-node-go`/ldk_node/universal-macos/libldk_node.dylib "./build/bin/${{ env.EXEC_NAME }}.app/Contents/Frameworks/" shell: bash - name: Patch executable RPATH if: runner.os == 'macOS' run: | - install_name_tool -add_rpath @executable_path/../Frameworks ./build/bin/${{ env.EXEC_NAME }}.app/Contents/MacOS/${{ env.EXEC_NAME }} + install_name_tool -add_rpath @executable_path/../Frameworks "./build/bin/${{ env.EXEC_NAME }}.app/Contents/MacOS/${{ env.EXEC_NAME }}" - name: Add macOS perms if: runner.os == 'macOS' - run: chmod +x build/bin/${{ env.EXEC_NAME }}.app/Contents/MacOS/${{ env.EXEC_NAME }} + run: chmod +x "build/bin/${{ env.EXEC_NAME }}.app/Contents/MacOS/${{ env.EXEC_NAME }}" shell: bash - name: Add Linux perms if: runner.os == 'Linux' - run: chmod +x build/bin/${{ env.PACKAGE_NAME }}/bin/${{ env.EXEC_NAME }} + run: chmod +x "build/bin/${{ env.PACKAGE_NAME }}/bin/${{ env.EXEC_NAME }}" shell: bash # Store everything in a tar archive to preserve permissions @@ -189,7 +189,7 @@ jobs: if: runner.os == 'macOS' run: | echo "Signing Package" - /usr/bin/codesign -s "Developer ID Application: Alby Inc." -f -v --deep --timestamp --options runtime --entitlements ./build/darwin/entitlements.plist ./build/bin/AlbyHub.app + /usr/bin/codesign -s "Developer ID Application: Alby Inc." -f -v --deep --timestamp --options runtime --entitlements ./build/darwin/entitlements.plist "./build/bin/${{ env.EXEC_NAME }}.app" env: AC_USERNAME: ${{ secrets.APPLE_USERNAME }} AC_PASSWORD: ${{ secrets.APPLE_PASSWORD }} @@ -199,12 +199,26 @@ jobs: if: runner.os == 'macOS' run: | mkdir -p ./build/out - create-dmg --volname "AlbyHub" --background "./build/darwin/dmgcover.png" --window-pos 200 120 --window-size 800 400 --icon-size 80 --icon "AlbyHub.app" 200 160 --hide-extension "AlbyHub.app" --app-drop-link 600 160 "./build/out/${{ env.PACKAGE_NAME }}.dmg" "./build/bin/${{ env.EXEC_NAME }}.app" + create-dmg --volname "Alby Hub" --background "./build/darwin/dmgcover.png" --window-pos 200 120 --window-size 800 400 --icon-size 80 --icon "${{ env.EXEC_NAME }}.app" 200 160 --hide-extension "${{ env.EXEC_NAME }}.app" --app-drop-link 600 160 "./build/out/${{ env.PACKAGE_NAME }}.dmg" "./build/bin/${{ env.EXEC_NAME }}.app" rm -Rf ./build/bin/* mv ./build/out/${{ env.PACKAGE_NAME }}.dmg ./build/bin/ + - name: Generate gon-notarize.json + if: runner.os == 'macOS' + run: | + cat > ./build/darwin/gon-notarize.json << EOF + { + "notarize": [ + { + "path": "./build/bin/${PACKAGE_NAME}.dmg", + "bundle_id": "com.getalby.AlbyHub" + } + ] + } + EOF + - name: Notarize the DMG image - if: runner.os == 'macOS' && inputs.build-release + if: runner.os == 'macOS' run: | echo "Notarizing Zip Files" gon -log-level=info -log-json ./build/darwin/gon-notarize.json diff --git a/build/darwin/gon-notarize.json b/build/darwin/gon-notarize.json deleted file mode 100644 index c0c34c02..00000000 --- a/build/darwin/gon-notarize.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "notarize": [ - { - "path": "./build/bin/albyhub-Desktop-macOS.dmg", - "bundle_id": "com.getalby.AlbyHub" - } - ] -} diff --git a/wails.json b/wails.json index 64b30e3c..4ec36e31 100644 --- a/wails.json +++ b/wails.json @@ -1,7 +1,7 @@ { "$schema": "https://wails.io/schemas/config.v2.json", - "name": "albyhub", - "outputfilename": "albyhub", + "name": "Alby Hub", + "outputfilename": "Alby Hub", "frontend:install": "yarn install", "frontend:build": "yarn build:wails", "frontend:dev:watcher": "yarn dev:wails", @@ -9,5 +9,9 @@ "author": { "name": "Alby Contributors", "email": "hello@getalby.com" + }, + "info": { + "companyName": "Alby Inc.", + "productName": "Alby Hub" } } diff --git a/wails/wails_app.go b/wails/wails_app.go index 4b776e3c..254be890 100644 --- a/wails/wails_app.go +++ b/wails/wails_app.go @@ -38,7 +38,7 @@ func (app *WailsApp) startup(ctx context.Context) { func LaunchWailsApp(app *WailsApp, assets embed.FS, appIcon []byte) { err := wails.Run(&options.App{ - Title: "AlbyHub", + Title: "Alby Hub", Width: 1024, Height: 768, AssetServer: &assetserver.Options{ @@ -54,7 +54,7 @@ func LaunchWailsApp(app *WailsApp, assets embed.FS, appIcon []byte) { }, Mac: &mac.Options{ About: &mac.AboutInfo{ - Title: "AlbyHub", + Title: "Alby Hub", Icon: appIcon, }, },