feat(updater): support bundle-specific targets #2624

kandrelczyk · 2025-04-11T21:07:54Z

Here are the changes for updater to handle #2277

I'm using the patched __TAURI_BUNDLE_TYPE variable to download the proper installer with fallback as described in #2277.

I've added some additional test on both Linux and Windows. Not sure if something needs to be done on other platforms.

…gins-workspace into feature/fallback_targets

…gins-workspace into feature/fallback_targets # Conflicts: # plugins/updater/tests/app-updater/tests/update.rs

…gins-workspace into feature/fallback_targets

…ature/fallback_targets

github-actions · 2025-04-12T00:59:14Z

Package Changes Through `5b4c1c1`

There are 2 changes which include deep-link with patch, deep-link-js with patch

Planned Package Versions

The following package releases are the planned based on the context of changes in this pull request.

package	current	next
deep-link-example-js	2.2.3	2.2.4
deep-link	2.4.0	2.4.1
deep-link-js	2.4.0	2.4.1
single-instance	2.3.1	2.3.2

Add another change file through the GitHub UI by following this link.

Read about change files or the docs at github.com/jbolda/covector

kandrelczyk · 2025-04-12T08:04:09Z

Windows and Linux tests are failing because they require tauri-cli with tauri-apps/tauri#13209 change.

MacOS test is failing because of some compliation issue. I will have access to a mac next week so I will fix it.

FabianLars · 2025-04-12T11:12:42Z

MacOS test is failing because of some compliation issue. I will have access to a mac next week so I will fix it.

It looks like you ran cargo update - if you revert the Cargo.lock file changes it should compile again.

FabianLars · 2025-04-12T11:14:14Z

plugins/updater/src/lib.rs

+/// patching during build
+#[unsafe(no_mangle)]
+#[link_section = ".data.ta"]
+pub static __TAURI_BUNDLE_TYPE: &str = "UNK_BUNDLE";


hmm, if possible it may make sense to move that into the main tauri crate (or utils idk) because a few people asked for this in the past regardless of the updater

I had it in the main tauri crate originally but build (cargo test) was failing during linking. I will try to move it to utils.

ah yeah i remember you mentioning this

lucasfernog · 2025-04-12T23:56:30Z

plugins/updater/src/updater.rs

@@ -342,11 +383,21 @@ pub struct Updater {
 }

 impl Updater {
+    fn get_updater_installer(&self) -> Result<Option<Installer>> {
+        match __TAURI_BUNDLE_TYPE {


__TAURI_BUNDLE_TYPE shouldn't be exported from Tauri, but we should map it to a PackageFormat type directly from tauri instead of doing the check here, it would make it type safe (instead of relying on string matching from tauri-cli)

What do we want to do for Mac, iOS and Android? Or in general case when the binary was not patched and we don't know the bundle type? I think the simplest thing to do would be to return PackageFormat::Unknown in case the binary was not patched and use #[cfg(target_os = "macos")] to return PackageFormat::Dmg for Mac.

We have BundleType in tauri::utils::config but if we want to return Unknown I would have to create new type. What would be the best place to put it? tauri::utils::config? some new module?

plugins/updater/src/updater.rs

FabianLars · 2025-07-08T15:57:40Z

Cargo.toml

@@ -39,3 +39,6 @@ codegen-units = 1
 lto = true
 incremental = false
 opt-level = "s"
+
+[patch.crates-io]
+tauri = { git = "https://github.com/tauri-apps/tauri", rev = "232265c70e1c213bbb3f84b5541ddc07d330fce1" }


we must not forget to configure the minimum version once tauri was released. sadly we can't set a min cli version.

…gins-workspace into feature/fallback_targets

Signed-off-by: Krzysztof Andrelczyk <cristof@curiana.net>

fallback targets

plugins/updater/src/updater.rs

kandrelczyk · 2025-07-16T17:24:34Z

plugins/updater/tests/app-updater/tests/update.rs

@@ -48,7 +49,7 @@ struct Update {
 fn build_app(cwd: &Path, config: &Config, bundle_updater: bool, target: BundleTarget) {
    let mut command = Command::new("cargo");
    command
-        .args(["tauri", "build", "--debug", "--verbose"])
+        .args(["tauri", "build", "--verbose"])


Since we had issues with the bundle type variable being stripped in release mode but not in debug mode I changed this. We test this in tauri crate as well but not we only have a warning there, not an error. The test will take longer but it may catch some issues that otherwise would slip through. What do you think?

Good idea to me

kandrelczyk · 2025-07-22T20:31:38Z

Ok, I've updated tauri version for updater plugin to 2.7 and the tests now pass with latest tauri-cli. Anything missing here?

beanow-at-crabnebula · 2025-07-23T10:48:45Z

plugins/updater/src/error.rs

+    /// Neither the platform not the fallback platform was not found in the updater JSON response.
+    #[error("the platform `{0}` and `{1}` were not found in the response `platforms` object")]
+    TargetsNotFound(String, String),


The error message reads like both are required to be present. But it's either, right?

beanow-at-crabnebula · 2025-07-23T10:50:36Z

plugins/updater/src/updater.rs

+        let mut download_url = release.download_url(&self.json_target);
+        let mut signature = release.signature(&self.json_target);
+
+        let installer = self.get_updater_installer();
+        if installer.is_none() && (download_url.is_err() || signature.is_err()) {
+            return Err(Error::TargetNotFound(self.json_target.clone()));
+        }


Because the updater is getting additional logic and decisions, can we add a few logs about those decisions?

beanow-at-crabnebula · 2025-07-23T10:51:41Z

plugins/updater/src/updater.rs

+                download_url: download_url?.to_owned(),
+                body: release.notes.clone(),
+                signature: signature?.to_owned(),
+                installer,


It looks like the installer would return Some even when the corresponding entry does not get used for it's download_url or signature.

I believe this is correct. We use this information later in install_inner to determine installation method. So for example if the current binary was packaged as Deb but we didn't find specific download_url for deb and used the fallback we still assume that it points to deb package and will try to install it as deb. If we know the current binary was packaged as deb it doesn't make sense to try to install the update as AppImage. Only in case we don't know what the current bundle type is will we fallback to AppImage.

beanow-at-crabnebula · 2025-07-23T10:53:18Z

plugins/updater/src/updater.rs

+            download_url =
+                release
+                    .download_url(target)
+                    .or(download_url.or(Err(Error::TargetsNotFound(
+                        self.json_target.clone(),
+                        target.clone(),
+                    ))));
+            signature = release
+                .signature(target)
+                .or(signature.or(Err(Error::TargetsNotFound(
+                    self.json_target.clone(),
+                    target.clone(),
+                ))));


You can't fall back separately for the download URL and signature.
Either we select one target's signature + url, or the other.

Currently if the target download URL exists, but the signature is missing, it will use the wrong signature.

kandrelczyk added 21 commits February 21, 2025 00:31

fallback targets

8aa131a

Merge branch 'tauri-apps:v2' into feature/fallback_targets

597ae9f

linux test

6ae53cf

Merge branch 'feature/fallback_targets' of github.com:kandrelczyk/plu…

e2e27ac

…gins-workspace into feature/fallback_targets

linux ready

ae7a2e3

RPM installation

dc75b76

small error fix

199a52b

fix windows build

ede0c68

windows tests

d50947c

Merge branch 'feature/fallback_targets' of github.com:kandrelczyk/plu…

ef95298

…gins-workspace into feature/fallback_targets # Conflicts: # plugins/updater/tests/app-updater/tests/update.rs

add aider files to .gitignore

012f633

get bundle type out of patched variable

c2877ec

windows tests

c9d0a6c

Merge branch 'feature/fallback_targets' of github.com:kandrelczyk/plu…

896678a

…gins-workspace into feature/fallback_targets

patch windows binary

8cb79a3

format

b1a8781

Merge branch 'feature/fallback_targets' of github.com:kandrelczyk/plu…

0630002

…gins-workspace into feature/fallback_targets

fix bundler

3a43397

Merge branch 'v2' of github.com:kandrelczyk/plugins-workspace into fe…

68564e0

…ature/fallback_targets

remove local tauri dependency

24504e4

remove print

5d12c97

kandrelczyk requested a review from a team as a code owner April 11, 2025 21:07

FabianLars reviewed Apr 12, 2025

View reviewed changes

kandrelczyk added 2 commits April 12, 2025 13:48

rever Cargo.lock

2137583

move __TAURI_BUNDLE_TYPE to tauri::utils

b80a295

lucasfernog reviewed Apr 12, 2025

View reviewed changes

get_current_bundle_type

f75d32b

SimenZhor mentioned this pull request Jun 13, 2025

Support multiple installer/bundle types per platform #2277

Open

lucasfernog added 2 commits July 7, 2025 12:35

Merge remote-tracking branch 'origin/v2' into feature/fallback_targets

1ea7522

update tauri

940ed70

lucasfernog changed the title ~~Feature/fallback targets~~ feat(updater): support bundle-specific targets Jul 7, 2025

fix macos integration test

201a001

Legend-Master reviewed Jul 8, 2025

View reviewed changes

plugins/updater/src/updater.rs Outdated Show resolved Hide resolved

FabianLars reviewed Jul 8, 2025

View reviewed changes

kandrelczyk added 4 commits July 8, 2025 23:55

Merge branch 'v2' into feature/fallback_targets

80b07ee

Merge branch 'feature/fallback_targets' of github.com:kandrelczyk/plu…

513376b

…gins-workspace into feature/fallback_targets

fix fallback logic

9e9d7bc

Signed-off-by: Krzysztof Andrelczyk <cristof@curiana.net>

amend! fallback targets

f7c10ea

fallback targets

Legend-Master reviewed Jul 11, 2025

View reviewed changes

plugins/updater/src/updater.rs Outdated Show resolved Hide resolved

kandrelczyk added 2 commits July 14, 2025 14:25

reformat

2fdda08

fix tests

4913dbe

kandrelczyk commented Jul 16, 2025

View reviewed changes

kandrelczyk added 3 commits July 16, 2025 23:25

reformat

5eae160

Merge branch 'v2' into feature/fallback_targets

5056198

bump tari versio

5b4c1c1

beanow-at-crabnebula reviewed Jul 23, 2025

View reviewed changes

feat(updater): support bundle-specific targets #2624

Are you sure you want to change the base?

feat(updater): support bundle-specific targets #2624

Uh oh!

Conversation

kandrelczyk commented Apr 11, 2025

Uh oh!

github-actions bot commented Apr 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Package Changes Through 5b4c1c1

Uh oh!

kandrelczyk commented Apr 12, 2025

Uh oh!

FabianLars commented Apr 12, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kandrelczyk commented Jul 22, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Apr 12, 2025 •

edited

Loading

Package Changes Through `5b4c1c1`