diff options
| author | David Lönnhager <david.l@mullvad.net> | 2025-03-17 09:59:08 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2025-03-17 09:59:08 +0100 |
| commit | 7df38937de439ef36def95b2b741abb0c1fc7e86 (patch) | |
| tree | 2bbdd01b2b3474d697e7d5395559f65c3f746abc | |
| parent | fdd78988c0a810ce51fc382e3cf5a9daa7459bbd (diff) | |
| parent | 33fb7d6692b6bd55aef9ba0e155c037426cb94e4 (diff) | |
| download | mullvadvpn-7df38937de439ef36def95b2b741abb0c1fc7e86.tar.xz mullvadvpn-7df38937de439ef36def95b2b741abb0c1fc7e86.zip | |
Merge branch 'add-meta-toml-config'
| -rw-r--r-- | desktop/scripts/release/meta.toml | 3 | ||||
| -rw-r--r-- | mullvad-update/meta/src/artifacts.rs | 18 | ||||
| -rw-r--r-- | mullvad-update/meta/src/platform.rs | 2 |
3 files changed, 18 insertions, 5 deletions
diff --git a/desktop/scripts/release/meta.toml b/desktop/scripts/release/meta.toml new file mode 100644 index 0000000000..46648dcd84 --- /dev/null +++ b/desktop/scripts/release/meta.toml @@ -0,0 +1,3 @@ +base_urls = [ + "https://bunny.cdn.app.mullvad.net" +]
\ No newline at end of file diff --git a/mullvad-update/meta/src/artifacts.rs b/mullvad-update/meta/src/artifacts.rs index 907b49bbe7..8617c0deaf 100644 --- a/mullvad-update/meta/src/artifacts.rs +++ b/mullvad-update/meta/src/artifacts.rs @@ -12,6 +12,7 @@ use mullvad_update::{format, hash}; /// See [crate::config::Config::base_urls] for the assumptions made. pub async fn generate_installer_details( architecture: format::Architecture, + version: &mullvad_version::Version, base_urls: &[String], artifact: &Path, ) -> anyhow::Result<format::Installer> { @@ -36,7 +37,7 @@ pub async fn generate_installer_details( .file_name() .and_then(|f| f.to_str()) .context("Unexpected filename")?; - let urls = derive_urls(base_urls, filename); + let urls = derive_urls(base_urls, version, filename); Ok(format::Installer { architecture, @@ -46,12 +47,16 @@ pub async fn generate_installer_details( }) } -fn derive_urls(base_urls: &[String], filename: &str) -> Vec<String> { +fn derive_urls( + base_urls: &[String], + version: &mullvad_version::Version, + filename: &str, +) -> Vec<String> { base_urls .iter() .map(|base_url| { let url = base_url.strip_suffix("/").unwrap_or(base_url); - format!("{url}/{}", filename) + format!("{url}/{version}/{}", filename) }) .collect() } @@ -69,8 +74,11 @@ mod test { ]; assert_eq!( - &derive_urls(&base_urls, "test.exe"), - &["https://fake1.fake/test.exe", "https://fake2.fake/test.exe",] + &derive_urls(&base_urls, &"2025.1".parse().unwrap(), "test.exe"), + &[ + "https://fake1.fake/2025.1/test.exe", + "https://fake2.fake/2025.1/test.exe" + ], ); } } diff --git a/mullvad-update/meta/src/platform.rs b/mullvad-update/meta/src/platform.rs index a781362d76..4a75df736d 100644 --- a/mullvad-update/meta/src/platform.rs +++ b/mullvad-update/meta/src/platform.rs @@ -307,6 +307,7 @@ impl Platform { installers.push( artifacts::generate_installer_details( format::Architecture::Arm64, + version, base_urls, &artifact, ) @@ -317,6 +318,7 @@ impl Platform { installers.push( artifacts::generate_installer_details( format::Architecture::X86, + version, base_urls, &artifact, ) |