chore(build): remove deprecated tauri build script and update publish workflow for Linux compatibility

Author: tonyantony300

.github/workflows/publish.yml

@@ -145,14 +145,12 @@ jobs:
             rust_target: x86_64-unknown-linux-gnu
             args: ''
             cache_key: ubuntu-x86_64
-            tauri_script: 'npm run tauri:build:linux --'
           - label: linux-arm64
             platform: 'ubuntu-22.04-arm'
             arch: aarch64
             rust_target: aarch64-unknown-linux-gnu
             args: ''
             cache_key: ubuntu-aarch64
-            tauri_script: 'npm run tauri:build:linux --'
           - label: windows-x64
             platform: 'windows-latest'
             arch: x86_64
@@ -297,11 +295,21 @@ jobs:
           releaseId: ${{ needs.prepare-release.outputs.release_id }}
           tagName: ${{ github.ref_name }}
           args: ${{ matrix.args }}
-          tauriScript: ${{ matrix.tauri_script || 'npm run tauri --' }}
           releaseDraft: true
           prerelease: false
           includeUpdaterJson: true
 
+      # Tauri's bundler hardcodes Ubuntu 22.04 deb dependency names. Rewrite them
+      # to also accept Debian / Ubuntu 24.04+ names, then overwrite the uploaded asset.
+      - name: Patch Linux .deb dependencies (ubuntu only)
+        if: contains(matrix.platform, 'ubuntu')
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+          RELEASE_ID: ${{ needs.prepare-release.outputs.release_id }}
+        run: node scripts/patch-linux-deb.js
+
   # Uses repository secrets: ANDROID_KEY_BASE64, ANDROID_KEY_ALIAS, ANDROID_KEY_PASSWORD
   # (same names as https://v2.tauri.app/distribute/sign/android/).
   # Builds universal (F-Droid) + per-ABI APKs (arm64, armv7, x86, x86_64); see scripts/android-release-build.js.

package.json

@@ -8,7 +8,6 @@
 		"build": "tsc -b && vite build",
 		"preview": "vite preview",
 		"tauri": "tauri",
-		"tauri:build:linux": "node ./scripts/tauri-build-linux.js",
 		"android:dev": "tauri android dev",
 		"android:build": "tauri android build",
 		"release": "node ./scripts/release.js",

scripts/tauri-build-linux.js scripts/patch-linux-deb.jsscripts/tauri-build-linux.js renamed to scripts/patch-linux-deb.js

@@ -1,12 +1,16 @@
 #!/usr/bin/env node
 
 /**
- * Linux release build: run `tauri build`, then rewrite the .deb dependency
- * metadata so installs work on Debian and Ubuntu.
+ * Rewrites .deb dependency metadata so installs work on Debian and Ubuntu, then
+ * re-uploads the patched package to the GitHub release (overwriting the asset
+ * that tauri-action just uploaded).
  *
  * Tauri's bundler emits Ubuntu 22.04 package names (libappindicator3-1,
  * libgtk-3-0). Debian and newer Ubuntu releases use libayatana-appindicator3-1
  * and libgtk-3-0t64 instead, so we declare both alternatives.
+ *
+ * Runs as a post-build step in CI. Re-upload is skipped when RELEASE_ID is not
+ * set, so the script can also be run locally to patch a build.
  */
 
 import fs from 'node:fs'
@@ -20,19 +24,6 @@ const repoRoot = path.join(__dirname, '..')
 const COMPATIBLE_DEPENDS =
 	'libayatana-appindicator3-1 | libappindicator3-1, libwebkit2gtk-4.1-0, libgtk-3-0t64 | libgtk-3-0'
 
-function runTauriBuild(args) {
-	if (args.length === 0) {
-		console.error('Usage: node scripts/tauri-build-linux.js <tauri args...>')
-		process.exit(1)
-	}
-
-	execSync(`npx tauri ${args.map((arg) => JSON.stringify(arg)).join(' ')}`, {
-		cwd: repoRoot,
-		stdio: 'inherit',
-		shell: true,
-	})
-}
-
 function findDebArtifacts() {
 	const debDir = path.join(repoRoot, 'src-tauri/target/release/bundle/deb')
 	if (!fs.existsSync(debDir)) {
@@ -48,12 +39,9 @@ function findDebArtifacts() {
 function patchDeb(debPath) {
 	const tmpDir = fs.mkdtempSync(path.join('/tmp', 'altsendme-deb-'))
 	try {
-		execSync(
-			`dpkg-deb -R ${JSON.stringify(debPath)} ${JSON.stringify(tmpDir)}`,
-			{
-				stdio: 'pipe',
-			}
-		)
+		execSync(`dpkg-deb -R ${JSON.stringify(debPath)} ${JSON.stringify(tmpDir)}`, {
+			stdio: 'pipe',
+		})
 
 		const controlPath = path.join(tmpDir, 'DEBIAN', 'control')
 		const original = fs.readFileSync(controlPath, 'utf8')
@@ -67,31 +55,58 @@ function patchDeb(debPath) {
 		)
 		if (patched === original) {
 			console.log(`Already compatible: ${debPath}`)
-			return
+			return false
 		}
 
 		fs.writeFileSync(controlPath, patched)
-		execSync(
-			`dpkg-deb -b ${JSON.stringify(tmpDir)} ${JSON.stringify(debPath)}`,
-			{
-				stdio: 'pipe',
-			}
-		)
+		execSync(`dpkg-deb -b ${JSON.stringify(tmpDir)} ${JSON.stringify(debPath)}`, {
+			stdio: 'pipe',
+		})
 
 		console.log(`Patched ${debPath}`)
 		console.log(`  Depends: ${COMPATIBLE_DEPENDS}`)
+		return true
 	} finally {
 		fs.rmSync(tmpDir, { recursive: true, force: true })
 	}
 }
 
-runTauriBuild(process.argv.slice(2))
+function reuploadAsset(debPath) {
+	const releaseId = process.env.RELEASE_ID
+	const repo = process.env.GITHUB_REPOSITORY
+	if (!releaseId || !repo) {
+		console.log('RELEASE_ID/GITHUB_REPOSITORY not set; skipping re-upload.')
+		return
+	}
+
+	const name = path.basename(debPath)
+	const assetId = execSync(
+		`gh api "repos/${repo}/releases/${releaseId}/assets" --jq ".[] | select(.name == \\"${name}\\") | .id // empty"`
+	)
+		.toString()
+		.trim()
+
+	if (assetId) {
+		execSync(`gh api --method DELETE "repos/${repo}/releases/assets/${assetId}"`, {
+			stdio: 'pipe',
+		})
+	}
+
+	execSync(
+		`gh api --method POST -H "Content-Type: application/vnd.debian.binary-package" --input ${JSON.stringify(debPath)} "https://uploads.github.com/repos/${repo}/releases/${releaseId}/assets?name=${name}"`,
+		{ stdio: 'pipe' }
+	)
+	console.log(`Re-uploaded ${name} to release ${releaseId}`)
+}
 
 const debPaths = findDebArtifacts()
 if (debPaths.length === 0) {
 	console.log('No .deb artifacts found; skipping dependency patch.')
 } else {
 	for (const debPath of debPaths) {
-		patchDeb(debPath)
+		const changed = patchDeb(debPath)
+		if (changed) {
+			reuploadAsset(debPath)
+		}
 	}
 }

src-tauri/src/tray.rs

@@ -1,7 +1,8 @@
-use std::sync::atomic::{AtomicBool, Ordering};
-
 use tauri::{AppHandle, Manager};
 
+#[cfg(not(target_os = "macos"))]
+use std::sync::atomic::{AtomicBool, Ordering};
+
 #[cfg(not(target_os = "macos"))]
 use tauri::{
     menu::{Menu, MenuItem},