Switch updater packaging from DMG to tar.gz archives

Update workflow to create, sign, and release .tar.gz archives instead of
DMG files for both architectures. Improve updater logging.

Author: LeeeSe

.github/workflows/main.yml

@@ -66,47 +66,56 @@ jobs:
           VERSION=$(grep '^version =' Cargo.toml | sed 's/version = "\(.*\)"/\1/')
           echo "version=$VERSION" >> $GITHUB_OUTPUT
 
-      - name: Sign DMG files for Updater
+      - name: Create targz Archives
         run: |
           VERSION=${{ steps.package_version.outputs.version }}
-          # 定义两个架构的 DMG 文件路径
-          DMG_AARCH64="./target/release/MessAuto_${VERSION}_aarch64.dmg"
-          DMG_X86_64="./target/x86_64-apple-darwin/release/MessAuto_${VERSION}_x64.dmg"
+          echo "Creating aarch64 .tar.gz archive..."
+          # -C 参数可以让我们在指定的目录中执行压缩，避免在归档中包含多余的父目录
+          tar -czf "MessAuto_${VERSION}_aarch64.app.tar.gz" -C ./target/release/MessAuto.app
+          echo "Creating x86_64 .tar.gz archive..."
+          tar -czf "MessAuto_${VERSION}_x64.app.tar.gz" -C ./target/x86_64-apple-darwin/release/MessAuto.app
 
-          echo "Signing AARCH64 DMG..."
+      - name: Sign Archives for Updater
+        run: |
+          VERSION=${{ steps.package_version.outputs.version }}
+          # 定义两个架构的 .tar.gz 文件路径
+          ARCHIVE_AARCH64="./MessAuto_${VERSION}_aarch64.app.tar.gz"
+          ARCHIVE_X86_64="./MessAuto_${VERSION}_x64.app.tar.gz"
+
+          echo "Signing AARCH64 archive..."
           cargo packager signer sign \
             --private-key ${{ secrets.UPDATER_PRIVATE_KEY }} \
             --password ${{ secrets.UPDATER_KEY_PASSWORD }} \
-            "$DMG_AARCH64"
+            "$ARCHIVE_AARCH64"
 
-          echo "Signing X86_64 DMG..."
+          echo "Signing X86_64 archive..."
           cargo packager signer sign \
             --private-key ${{ secrets.UPDATER_PRIVATE_KEY }} \
             --password ${{ secrets.UPDATER_KEY_PASSWORD }} \
-            "$DMG_X86_64"
+            "$ARCHIVE_X86_64"
 
       - name: Create Update Manifests (update.json)
         run: |
           VERSION=${{ steps.package_version.outputs.version }}
-          DMG_AARCH64="./target/release/MessAuto_${VERSION}_aarch64.dmg"
-          DMG_X86_64="./target/x86_64-apple-darwin/release/MessAuto_${VERSION}_x64.dmg"
+          ARCHIVE_AARCH64="./MessAuto_${VERSION}_aarch64.app.tar.gz"
+          ARCHIVE_X86_64="./MessAuto_${VERSION}_x64.app.tar.gz"
 
           # 为 aarch64 生成 update.json
-          SIGNATURE_AARCH64=$(cat "${DMG_AARCH64}.sig")
+          SIGNATURE_AARCH64=$(cat "${ARCHIVE_AARCH64}.sig")
           echo "{
             \"version\": \"${{ github.ref_name }}\",
             \"pub_date\": \"$(date -u +"%Y-%m-%dT%H:%M:%SZ")\",
-            \"url\": \"https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/MessAuto_${VERSION}_aarch64.dmg\",
+            \"url\": \"https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/MessAuto_${VERSION}_aarch64.app.tar.gz\",
             \"signature\": \"$SIGNATURE_AARCH64\",
             \"format\": \"app\"
           }" > ./update-aarch64.json
 
           # 为 x86_64 生成 update.json
-          SIGNATURE_X86_64=$(cat "${DMG_X86_64}.sig")
+          SIGNATURE_X86_64=$(cat "${ARCHIVE_X86_64}.sig")
           echo "{
             \"version\": \"${{ github.ref_name }}\",
             \"pub_date\": \"$(date -u +"%Y-%m-%dT%H:%M:%SZ")\",
-            \"url\": \"https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/MessAuto_${VERSION}_x64.dmg\",
+            \"url\": \"https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/MessAuto_${VERSION}_x64.app.tar.gz\",
             \"signature\": \"$SIGNATURE_X86_64\",
             \"format\": \"app\"
           }" > ./update-x86_64.json
@@ -117,6 +126,8 @@ jobs:
           gh release upload ${{ github.ref_name }} \
             ./target/release/MessAuto_${VERSION}_aarch64.dmg \
             ./target/x86_64-apple-darwin/release/MessAuto_${VERSION}_x64.dmg \
+            ./MessAuto_${VERSION}_aarch64.app.tar.gz \
+            ./MessAuto_${VERSION}_x64.app.tar.gz \
             ./update-aarch64.json \
             ./update-x86_64.json
         env:

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "messauto"
-version = "1.0.1"
+version = "1.1.0"
 edition = "2024"
 
 [dependencies]

Cargo.toml

@@ -37,7 +37,10 @@ pub fn check_for_updates() {
         let current_version = match Version::parse(CURRENT_VERSION) {
             Ok(version) => version,
             Err(e) => {
-                error!("{}", t!("updater.failed_to_parse_version", error = e.to_string()));
+                error!(
+                    "{}",
+                    t!("updater.failed_to_parse_version", error = e.to_string())
+                );
                 return;
             }
         };
@@ -52,35 +55,57 @@ pub fn check_for_updates() {
 
         match check_update(current_version, config) {
             Ok(Some(update)) => {
-                info!("{}", t!("updater.new_version_found", version = update.version.to_string()));
+                info!(
+                    "{}",
+                    t!(
+                        "updater.new_version_found",
+                        version = update.version.to_string()
+                    )
+                );
                 match download_update(update) {
                     Ok((update_obj, update_bytes)) => {
                         info!("{}", t!("updater.update_download_complete"));
                         if show_install_notification(&update_obj.version) {
+                            let byc = update_bytes.clone();
                             if let Err(e) = install_update(update_obj, update_bytes) {
-                                error!("{}", t!("updater.update_check_failed", error = e.to_string()));
+                                error!(
+                                    "{}",
+                                    t!("updater.update_check_failed", error = e.to_string())
+                                );
+                                // 输出 update_bytes 的前 100 可读数据
+                                info!(
+                                    "update_bytes (first 64 bytes in hex): {:02x?}",
+                                    &byc[..std::cmp::min(64, byc.len())]
+                                );
                             }
                         } else {
                             info!("{}", t!("updater.user_canceled_update"));
                         }
                     }
                     Err(e) => {
-                        error!("{}", t!("updater.update_download_failed", error = e.to_string()));
+                        error!(
+                            "{}",
+                            t!("updater.update_download_failed", error = e.to_string())
+                        );
                     }
                 }
             }
             Ok(None) => {
                 info!("{}", t!("updater.already_up_to_date"));
             }
             Err(e) => {
-                error!("{}", t!("updater.update_check_failed", error = e.to_string()));
+                error!(
+                    "{}",
+                    t!("updater.update_check_failed", error = e.to_string())
+                );
             }
         }
     });
 }
 
 fn download_update(update: Update) -> Result<(Update, Vec<u8>), Box<dyn std::error::Error>> {
     info!("{}", t!("updater.downloading_update"));
+    info!("{:?}", update.download_url);
 
     let update_bytes = update.download()?;
     info!("{}", t!("updater.update_downloaded"));
@@ -99,7 +124,10 @@ fn install_update(update: Update, update_bytes: Vec<u8>) -> Result<(), Box<dyn s
 }
 
 fn show_install_notification(version: &str) -> bool {
-    info!("{}", t!("updater.new_version_downloaded", version = version));
+    info!(
+        "{}",
+        t!("updater.new_version_downloaded", version = version)
+    );
 
     // 使用系统通知询问用户是否要安装更新
     let title = t!("updater.update_available");
@@ -109,7 +137,12 @@ fn show_install_notification(version: &str) -> bool {
         t!("updater.update_installed")
     );
 
-    let user_choice = notification::dialog(&title, &content, &t!("updater.install"), &t!("updater.user_chosen_later"));
+    let user_choice = notification::dialog(
+        &title,
+        &content,
+        &t!("updater.install"),
+        &t!("updater.user_chosen_later"),
+    );
 
     if user_choice {
         info!("{}", t!("updater.user_chosen_install"));