diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-12-09 14:50:02 +0100 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-12-09 14:50:02 +0100 |
| commit | 018fe963c17b360fcf7623370785420ae41eda2e (patch) | |
| tree | a7299d0d4eb8fa0a0bde89c1b70f3f08ec5f2a03 | |
| parent | 15bc03dbe629b813f5d4d2774a33ea1665832d1b (diff) | |
| parent | 5472bd452faf8c394773df3d12b69428ddf70ee2 (diff) | |
| download | mullvadvpn-018fe963c17b360fcf7623370785420ae41eda2e.tar.xz mullvadvpn-018fe963c17b360fcf7623370785420ae41eda2e.zip | |
Merge branch 'automatic-publishing-to-f-droid-droid-329'
| -rwxr-xr-x | android/fdroid-build/env.sh | 2 | ||||
| -rw-r--r-- | dist-assets/android-version-code.txt | 1 | ||||
| -rw-r--r-- | dist-assets/android-version-name.txt (renamed from dist-assets/android-product-version.txt) | 0 | ||||
| -rw-r--r-- | mullvad-version/build.rs | 4 | ||||
| -rw-r--r-- | mullvad-version/src/main.rs | 3 | ||||
| -rwxr-xr-x | prepare-release.sh | 6 |
6 files changed, 9 insertions, 7 deletions
diff --git a/android/fdroid-build/env.sh b/android/fdroid-build/env.sh index c6c3e224b6..641257c021 100755 --- a/android/fdroid-build/env.sh +++ b/android/fdroid-build/env.sh @@ -7,7 +7,7 @@ source "$HOME/.cargo/env" # Ensure Go compiler is accessible export GOROOT="$HOME/go" -export PATH="$PATH:$GOROOT/bin" +export PATH="$GOROOT/bin:$PATH" # Ensure Rust crates know which tools to use for cross-compilation export NDK_TOOLCHAIN_DIR="$NDK_PATH/toolchains/llvm/prebuilt/linux-x86_64/bin" diff --git a/dist-assets/android-version-code.txt b/dist-assets/android-version-code.txt new file mode 100644 index 0000000000..81911bc430 --- /dev/null +++ b/dist-assets/android-version-code.txt @@ -0,0 +1 @@ +24099000 diff --git a/dist-assets/android-product-version.txt b/dist-assets/android-version-name.txt index fc8e3b7ab1..fc8e3b7ab1 100644 --- a/dist-assets/android-product-version.txt +++ b/dist-assets/android-version-name.txt diff --git a/mullvad-version/build.rs b/mullvad-version/build.rs index d5f3859e98..72ebf588a0 100644 --- a/mullvad-version/build.rs +++ b/mullvad-version/build.rs @@ -8,7 +8,7 @@ use std::{ /// in dev builds. const GIT_HASH_DEV_SUFFIX_LEN: usize = 6; -const ANDROID_VERSION_FILE_PATH: &str = "../dist-assets/android-product-version.txt"; +const ANDROID_VERSION_FILE_PATH: &str = "../dist-assets/android-version-name.txt"; const DESKTOP_VERSION_FILE_PATH: &str = "../dist-assets/desktop-product-version.txt"; #[derive(Debug, Copy, Clone)] @@ -38,7 +38,7 @@ fn main() { let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap()); fs::write(out_dir.join("product-version.txt"), product_version).unwrap(); fs::write( - out_dir.join("android-product-version.txt"), + out_dir.join("android-version-name.txt"), android_product_version, ) .unwrap(); diff --git a/mullvad-version/src/main.rs b/mullvad-version/src/main.rs index 2e83cf24ee..7f9001ec61 100644 --- a/mullvad-version/src/main.rs +++ b/mullvad-version/src/main.rs @@ -1,8 +1,7 @@ use mullvad_version::{PreStableType, Version}; use std::{env, process::exit}; -const ANDROID_VERSION: &str = - include_str!(concat!(env!("OUT_DIR"), "/android-product-version.txt")); +const ANDROID_VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/android-version-name.txt")); fn main() { let command = env::args().nth(1); diff --git a/prepare-release.sh b/prepare-release.sh index 7e6b443569..0d3b65d56d 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -73,9 +73,11 @@ if [[ "$DESKTOP" == "true" ]]; then fi if [[ "$ANDROID" == "true" ]]; then - echo "$PRODUCT_VERSION" > dist-assets/android-product-version.txt + echo "$PRODUCT_VERSION" > dist-assets/android-version-name.txt + cargo run -q --bin mullvad-version versionCode > dist-assets/android-version-code.txt git commit -S -m "Update android app version to $PRODUCT_VERSION" \ - dist-assets/android-product-version.txt + dist-assets/android-version-name.txt \ + dist-assets/android-version-code.txt fi NEW_TAGS="" |