From 2ba5385058fdef95d6989020a29522ff2f4623bd Mon Sep 17 00:00:00 2001 From: Joep Meindertsma Date: Thu, 25 Nov 2021 13:08:11 +0100 Subject: [PATCH] #215 add tauri splashscreen and publish action --- .github/workflows/tauri-publish.yml | 45 ++++++++++++ CHANGELOG.md | 5 ++ server/static/tauri-splashscreen.html | 102 ++++++++++++++++++++++++++ src-tauri/tauri.conf.json | 7 +- 4 files changed, 157 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/tauri-publish.yml create mode 100644 server/static/tauri-splashscreen.html diff --git a/.github/workflows/tauri-publish.yml b/.github/workflows/tauri-publish.yml new file mode 100644 index 000000000..27c73b403 --- /dev/null +++ b/.github/workflows/tauri-publish.yml @@ -0,0 +1,45 @@ +name: "tauri-publish" + +on: + workflow_dispatch: + +jobs: + publish-tauri: + strategy: + fail-fast: false + matrix: + platform: [macos-latest, ubuntu-latest, windows-latest] + + runs-on: ${{ matrix.platform }} + steps: + - uses: actions/checkout@v2 + - name: setup node + uses: actions/setup-node@v1 + with: + node-version: 12 + - name: install Rust stable + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + - name: install webkit2gtk (ubuntu only) + if: matrix.platform == 'ubuntu-latest' + run: | + sudo apt-get update + sudo apt-get install -y webkit2gtk-4.0 + - name: install app dependencies and build it + run: yarn && yarn build + - uses: tauri-apps/tauri-action@v0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }} + # APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }} + # APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }} + # APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_IDENTITY_ID }} + # APPLE_ID: ${{ secrets.APPLE_ID }} + # APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} + with: + tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version + releaseName: "App v__VERSION__" + releaseBody: "See the assets to download this version and install." + releaseDraft: true + prerelease: false diff --git a/CHANGELOG.md b/CHANGELOG.md index 6927063ea..09a18d040 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ List of changes for this repo, including `atomic-cli`, `atomic-server` and `atomic-lib`. By far most changes relate to `atomic-server`, so if not specified, assume the changes are relevant only for the server. +## v0.29.1 + +- Desktop build (using Tauri) with system tray, icon, installers, menu items. #215 +- Upgraded Actix to latest (needed for Tauri due to usage of Tokio runtime) #215 + ## v0.29.0 - Add authentication to restrict read access. Works by signing requests with Private Keys. #13 diff --git a/server/static/tauri-splashscreen.html b/server/static/tauri-splashscreen.html new file mode 100644 index 000000000..ffb6734a4 --- /dev/null +++ b/server/static/tauri-splashscreen.html @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + Atomic Data Browser + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 04a1388f0..fc5a777e6 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -5,7 +5,7 @@ }, "build": { "distDir": "../server/static", - "devPath": "http://localhost", + "devPath": "../server/static/tauri-splashscreen.html", "beforeDevCommand": "", "beforeBuildCommand": "" }, @@ -56,8 +56,11 @@ "title": "Atomic Server", "width": 800, "height": 600, + "alwaysOnTop": false, "resizable": true, - "fullscreen": false + "decorations": true, + "fullscreen": false, + "url": "tauri-splashscreen.html" } ], "systemTray": {