summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2025-04-02 18:31:45 +0200
committerDavid Lönnhager <david.l@mullvad.net>2025-04-03 16:45:06 +0200
commit119925c7887f735c688eaf491ea64d9e1b80b0c5 (patch)
tree132597b7893f612f5dee13a698cd979b6da6bbb1
parentd41f1e5bb361f0d89c63feb61640d0516240f69d (diff)
downloadmullvadvpn-119925c7887f735c688eaf491ea64d9e1b80b0c5.tar.xz
mullvadvpn-119925c7887f735c688eaf491ea64d9e1b80b0c5.zip
Rename 'meta' to 'mullvad-release'
-rw-r--r--Cargo.lock38
-rw-r--r--Cargo.toml2
-rwxr-xr-xdesktop/scripts/release/5-update-and-publish-metadata8
-rw-r--r--desktop/scripts/release/mullvad-release.toml (renamed from desktop/scripts/release/meta.toml)0
-rw-r--r--mullvad-update/mullvad-release/.gitignore (renamed from mullvad-update/meta/.gitignore)0
-rw-r--r--mullvad-update/mullvad-release/Cargo.toml (renamed from mullvad-update/meta/Cargo.toml)4
-rw-r--r--mullvad-update/mullvad-release/src/artifacts.rs (renamed from mullvad-update/meta/src/artifacts.rs)0
-rw-r--r--mullvad-update/mullvad-release/src/config.rs (renamed from mullvad-update/meta/src/config.rs)2
-rw-r--r--mullvad-update/mullvad-release/src/github.rs (renamed from mullvad-update/meta/src/github.rs)0
-rw-r--r--mullvad-update/mullvad-release/src/io_util.rs (renamed from mullvad-update/meta/src/io_util.rs)0
-rw-r--r--mullvad-update/mullvad-release/src/main.rs (renamed from mullvad-update/meta/src/main.rs)2
-rw-r--r--mullvad-update/mullvad-release/src/platform.rs (renamed from mullvad-update/meta/src/platform.rs)0
12 files changed, 28 insertions, 28 deletions
diff --git a/Cargo.lock b/Cargo.lock
index ba0020c920..d380fa522c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2479,25 +2479,6 @@ dependencies = [
]
[[package]]
-name = "meta"
-version = "0.0.0"
-dependencies = [
- "anyhow",
- "chrono",
- "clap",
- "hex",
- "mullvad-update",
- "mullvad-version",
- "rand 0.8.5",
- "reqwest",
- "serde",
- "serde_json",
- "sha2",
- "tokio",
- "toml 0.8.19",
-]
-
-[[package]]
name = "mime"
version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2891,6 +2872,25 @@ dependencies = [
]
[[package]]
+name = "mullvad-release"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "clap",
+ "hex",
+ "mullvad-update",
+ "mullvad-version",
+ "rand 0.8.5",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "sha2",
+ "tokio",
+ "toml 0.8.19",
+]
+
+[[package]]
name = "mullvad-setup"
version = "0.0.0"
dependencies = [
diff --git a/Cargo.toml b/Cargo.toml
index 92c04574cf..3768230f7c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,7 +31,7 @@ members = [
"mullvad-types",
"mullvad-types/intersection-derive",
"mullvad-update",
- "mullvad-update/meta",
+ "mullvad-update/mullvad-release",
"mullvad-version",
"talpid-core",
"talpid-dbus",
diff --git a/desktop/scripts/release/5-update-and-publish-metadata b/desktop/scripts/release/5-update-and-publish-metadata
index b9bf9915ab..dd72c2d948 100755
--- a/desktop/scripts/release/5-update-and-publish-metadata
+++ b/desktop/scripts/release/5-update-and-publish-metadata
@@ -43,7 +43,7 @@ function publish_metadata {
rm -rf currently_published/
echo ">>> Fetching current version metadata"
- meta pull --assume-yes "${platforms[@]}"
+ mullvad-release pull --assume-yes "${platforms[@]}"
echo ""
echo ">>> Backing up released data"
@@ -55,15 +55,15 @@ function publish_metadata {
echo ""
echo ">>> Adding new release $PRODUCT_VERSION (rollout = 1)"
- meta add-release "$PRODUCT_VERSION" "${platforms[@]}" 1
+ mullvad-release add-release "$PRODUCT_VERSION" "${platforms[@]}" 1
echo ""
echo ">>> Signing $PRODUCT_VERSION metadata"
- meta sign "${platforms[@]}"
+ mullvad-release sign "${platforms[@]}"
echo ""
echo ">>> Verifying signed metadata"
- meta verify "${platforms[@]}"
+ mullvad-release verify "${platforms[@]}"
echo ""
echo ">>> New metadata including $$PRODUCT_VERSION"
diff --git a/desktop/scripts/release/meta.toml b/desktop/scripts/release/mullvad-release.toml
index 46648dcd84..46648dcd84 100644
--- a/desktop/scripts/release/meta.toml
+++ b/desktop/scripts/release/mullvad-release.toml
diff --git a/mullvad-update/meta/.gitignore b/mullvad-update/mullvad-release/.gitignore
index 47ecd8473f..47ecd8473f 100644
--- a/mullvad-update/meta/.gitignore
+++ b/mullvad-update/mullvad-release/.gitignore
diff --git a/mullvad-update/meta/Cargo.toml b/mullvad-update/mullvad-release/Cargo.toml
index 7eba726e95..85a97ae9d0 100644
--- a/mullvad-update/meta/Cargo.toml
+++ b/mullvad-update/mullvad-release/Cargo.toml
@@ -1,6 +1,6 @@
[package]
-name = "meta"
-description = "Tools for managing Mullvad version metadata"
+name = "mullvad-release"
+description = "Tools for managing Mullvad release metadata"
authors.workspace = true
repository.workspace = true
license.workspace = true
diff --git a/mullvad-update/meta/src/artifacts.rs b/mullvad-update/mullvad-release/src/artifacts.rs
index 8617c0deaf..8617c0deaf 100644
--- a/mullvad-update/meta/src/artifacts.rs
+++ b/mullvad-update/mullvad-release/src/artifacts.rs
diff --git a/mullvad-update/meta/src/config.rs b/mullvad-update/mullvad-release/src/config.rs
index 822fedded1..144c209b04 100644
--- a/mullvad-update/meta/src/config.rs
+++ b/mullvad-update/mullvad-release/src/config.rs
@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
use tokio::{fs, io};
/// Path to the configuration file. Currently a file in the working directory.
-const CONFIG_FILENAME: &str = "meta.toml";
+const CONFIG_FILENAME: &str = "mullvad-release.toml";
#[derive(Default, Deserialize, Serialize)]
pub struct Config {
diff --git a/mullvad-update/meta/src/github.rs b/mullvad-update/mullvad-release/src/github.rs
index c2e6b99bb0..c2e6b99bb0 100644
--- a/mullvad-update/meta/src/github.rs
+++ b/mullvad-update/mullvad-release/src/github.rs
diff --git a/mullvad-update/meta/src/io_util.rs b/mullvad-update/mullvad-release/src/io_util.rs
index 02f61e6669..02f61e6669 100644
--- a/mullvad-update/meta/src/io_util.rs
+++ b/mullvad-update/mullvad-release/src/io_util.rs
diff --git a/mullvad-update/meta/src/main.rs b/mullvad-update/mullvad-release/src/main.rs
index 478213b82c..7ba8469cd1 100644
--- a/mullvad-update/meta/src/main.rs
+++ b/mullvad-update/mullvad-release/src/main.rs
@@ -1,7 +1,7 @@
//! See [Opt].
//!
//! The tool can be installed using `cargo install --locked --path .`, after which it can be invoked
-//! with `meta ...`.
+//! with `mullvad-release ...`.
use anyhow::{bail, Context};
use clap::Parser;
diff --git a/mullvad-update/meta/src/platform.rs b/mullvad-update/mullvad-release/src/platform.rs
index 06ad8a7185..06ad8a7185 100644
--- a/mullvad-update/meta/src/platform.rs
+++ b/mullvad-update/mullvad-release/src/platform.rs