Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions .github/workflows/tauri-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,15 +183,21 @@ jobs:
run: node .github/scripts/set-tauri-version.mjs "$VERSION" "$UPDATER_ENDPOINT"

# --- macOS / Windows: standard wry build via tauri-action ---
- name: Configure updater artifacts
- name: Configure desktop bundles
if: ${{ !matrix.cef }}
shell: bash
env:
IS_NIGHTLY: ${{ needs.setup-release.outputs.nightly }}
MATRIX_NAME: ${{ matrix.name }}
run: |
ARGS=""
if [ -z "${TAURI_SIGNING_PRIVATE_KEY:-}" ]; then
echo 'TAURI_BUILD_ARGS=--config {"bundle":{"createUpdaterArtifacts":false}}' >> "$GITHUB_ENV"
else
echo "TAURI_BUILD_ARGS=" >> "$GITHUB_ENV"
ARGS='--config {"bundle":{"createUpdaterArtifacts":false}}'
fi
if [ "$IS_NIGHTLY" = "true" ] && [ "$MATRIX_NAME" = "Windows" ]; then
ARGS="$ARGS --bundles nsis"
fi
echo "TAURI_BUILD_ARGS=${ARGS# }" >> "$GITHUB_ENV"

- name: Build desktop bundles
id: tauri
Expand Down Expand Up @@ -219,6 +225,10 @@ jobs:
run: |
echo "$ARTIFACTS" | jq -r '.[]' | while read -r path; do
[ -n "$path" ] || continue
if [ ! -f "$path" ]; then
echo "Skipping non-file artifact: $path"
continue
fi
echo "Uploading $path"
gh release upload "$TAG" "$path" --clobber
done
Expand Down
2 changes: 1 addition & 1 deletion scripts/cef-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if [[ "$VERSION" == *-* ]]; then
RPM_VERSION="$BASE_VERSION"
RPM_ITERATION="0.${PRERELEASE}"
fi
STAGE="src-tauri/target/release"
STAGE="$ROOT/src-tauri/target/release"
OUT="$STAGE/bundle"
WORK="$STAGE/cef-pkg"

Expand Down
8 changes: 4 additions & 4 deletions src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ fn resolve_webview_permission(
}

pub fn show_or_create_main_window(app: &AppHandle<crate::BrowserEngine>) -> tauri::Result<()> {
if let Some(window) = app.get_webview_window(MAIN_WINDOW_LABEL) {
if let Some(_window) = app.get_webview_window(MAIN_WINDOW_LABEL) {
#[cfg(desktop)]
{
window.unminimize()?;
window.show()?;
window.set_focus()?;
_window.unminimize()?;
_window.show()?;
_window.set_focus()?;
}

return Ok(());
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "sable",
"version": "0.1.0",
"version": "1.20.0",
"identifier": "moe.sable.client",
"build": {
"frontendDist": "../dist",
Expand Down
Loading