diff --git a/.github/workflows/tauri-build.yml b/.github/workflows/tauri-build.yml index 8cb6078fc..a9a8d87cf 100644 --- a/.github/workflows/tauri-build.yml +++ b/.github/workflows/tauri-build.yml @@ -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 @@ -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 diff --git a/scripts/cef-package.sh b/scripts/cef-package.sh index 03f4a11f5..6f4aee710 100755 --- a/scripts/cef-package.sh +++ b/scripts/cef-package.sh @@ -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" diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index fcf7e1b48..3662d43b0 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -89,12 +89,12 @@ fn resolve_webview_permission( } pub fn show_or_create_main_window(app: &AppHandle) -> 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(()); diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index f1290c514..168388981 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -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",