GlcoinCore/alby-hub
1
0
Fork 0
mirror of https://github.com/getAlby/hub.git synced 2026-08-13 12:33:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

chore: use proper title in wails (#662)

Browse source
This commit is contained in:
Adithya Vardhan 2024-10-22 20:10:35 +05:30 • committed by GitHub
parent 1e138a6202
commit eaab2d8c1c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 39 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/create-release.yaml vendored
View file

@ -10,7 +10,7 @@ jobs:
release: release:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Download Linux server archives - name: Download server archives
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
pattern: albyhub-Server-* pattern: albyhub-Server-*

46
.github/workflows/wails.yml vendored
View file

@ -42,7 +42,7 @@ jobs:
- name: Setup - name: Setup
shell: bash shell: bash
run: | run: |
echo "EXEC_NAME=albyhub" >> $GITHUB_ENV echo "EXEC_NAME=Alby Hub" >> $GITHUB_ENV
echo "PACKAGE_NAME=albyhub-Desktop-${{ runner.os }}" >> $GITHUB_ENV echo "PACKAGE_NAME=albyhub-Desktop-${{ runner.os }}" >> $GITHUB_ENV
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -105,17 +105,17 @@ jobs:
- name: Build App - name: Build App
if: runner.os == 'macOS' 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 shell: bash
- name: Build App - name: Build App
if: runner.os == 'Linux' 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 shell: bash
- name: Build Windows App - name: Build Windows App
if: runner.os == 'Windows' 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 shell: bash
- name: Import Code-Signing Certificates for macOS - 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/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/ 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 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 shell: bash
- name: Patch executable RPATH - name: Patch executable RPATH
if: runner.os == 'Linux' if: runner.os == 'Linux'
run: | 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 - name: Copy shared libraries to the output directory
if: runner.os == 'macOS' if: runner.os == 'macOS'
run: | run: |
mkdir -p ./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 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/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/ 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 shell: bash
- name: Patch executable RPATH - name: Patch executable RPATH
if: runner.os == 'macOS' if: runner.os == 'macOS'
run: | 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 - name: Add macOS perms
if: runner.os == 'macOS' 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 shell: bash
- name: Add Linux perms - name: Add Linux perms
if: runner.os == 'Linux' 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 shell: bash
# Store everything in a tar archive to preserve permissions # Store everything in a tar archive to preserve permissions
@ -189,7 +189,7 @@ jobs:
if: runner.os == 'macOS' if: runner.os == 'macOS'
run: | run: |
echo "Signing Package" 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: env:
AC_USERNAME: ${{ secrets.APPLE_USERNAME }} AC_USERNAME: ${{ secrets.APPLE_USERNAME }}
AC_PASSWORD: ${{ secrets.APPLE_PASSWORD }} AC_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
@ -199,12 +199,26 @@ jobs:
if: runner.os == 'macOS' if: runner.os == 'macOS'
run: | run: |
mkdir -p ./build/out 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/* rm -Rf ./build/bin/*
mv ./build/out/${{ env.PACKAGE_NAME }}.dmg ./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 - name: Notarize the DMG image
if: runner.os == 'macOS' && inputs.build-release if: runner.os == 'macOS'
run: | run: |
echo "Notarizing Zip Files" echo "Notarizing Zip Files"
gon -log-level=info -log-json ./build/darwin/gon-notarize.json gon -log-level=info -log-json ./build/darwin/gon-notarize.json

8
build/darwin/gon-notarize.json
View file

@ -1,8 +0,0 @@
{
"notarize": [
{
"path": "./build/bin/albyhub-Desktop-macOS.dmg",
"bundle_id": "com.getalby.AlbyHub"
}
]
}

8
wails.json
View file

@ -1,7 +1,7 @@
{ {
"$schema": "https://wails.io/schemas/config.v2.json", "$schema": "https://wails.io/schemas/config.v2.json",
"name": "albyhub", "name": "Alby Hub",
"outputfilename": "albyhub", "outputfilename": "Alby Hub",
"frontend:install": "yarn install", "frontend:install": "yarn install",
"frontend:build": "yarn build:wails", "frontend:build": "yarn build:wails",
"frontend:dev:watcher": "yarn dev:wails", "frontend:dev:watcher": "yarn dev:wails",
@ -9,5 +9,9 @@
"author": { "author": {
"name": "Alby Contributors", "name": "Alby Contributors",
"email": "hello@getalby.com" "email": "hello@getalby.com"
},
"info": {
"companyName": "Alby Inc.",
"productName": "Alby Hub"
} }
} }

4
wails/wails_app.go
View file

@ -38,7 +38,7 @@ func (app *WailsApp) startup(ctx context.Context) {
func LaunchWailsApp(app *WailsApp, assets embed.FS, appIcon []byte) { func LaunchWailsApp(app *WailsApp, assets embed.FS, appIcon []byte) {
err := wails.Run(&options.App{ err := wails.Run(&options.App{
Title: "AlbyHub", Title: "Alby Hub",
Width: 1024, Width: 1024,
Height: 768, Height: 768,
AssetServer: &assetserver.Options{ AssetServer: &assetserver.Options{
@ -54,7 +54,7 @@ func LaunchWailsApp(app *WailsApp, assets embed.FS, appIcon []byte) {
}, },
Mac: &mac.Options{ Mac: &mac.Options{
About: &mac.AboutInfo{ About: &mac.AboutInfo{
Title: "AlbyHub", Title: "Alby Hub",
Icon: appIcon, Icon: appIcon,
}, },
}, },