From f29eeef1e6fedc1f4f9cee1a48f5c528abe43755 Mon Sep 17 00:00:00 2001 From: Mullvad build server Date: Fri, 22 Mar 2024 13:14:08 +0100 Subject: [PATCH 1/4] Update Android dockerfile to use newer base image --- android/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile index 2fb78c2afb10..1ed9a1ccdc6c 100644 --- a/android/docker/Dockerfile +++ b/android/docker/Dockerfile @@ -19,7 +19,7 @@ # patch for a given go version can be identified by checking the wireguard-android # repo: https://git.zx2c4.com/wireguard-android/tree/tunnel/tools/libwg-go. # It's also important to keep the go path in sync. -FROM ghcr.io/mullvad/mullvadvpn-app-build:1b882ccbc +FROM ghcr.io/mullvad/mullvadvpn-app-build:01a98bb5b # === Metadata === LABEL org.opencontainers.image.source=https://github.com/mullvad/mullvadvpn-app From eaa571739bf4d84eec55a005520b200116af718c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20F=C3=A4rnstrand?= Date: Fri, 22 Mar 2024 13:25:55 +0100 Subject: [PATCH 2/4] Bump Linux build container to new Rust 1.77 based one --- building/linux-container-image.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/building/linux-container-image.txt b/building/linux-container-image.txt index f9109d941470..5c4f7bc811b9 100644 --- a/building/linux-container-image.txt +++ b/building/linux-container-image.txt @@ -1 +1 @@ -ghcr.io/mullvad/mullvadvpn-app-build:1b882ccbc +ghcr.io/mullvad/mullvadvpn-app-build:01a98bb5b From 2c98ccb139f0092d90e3fef216a1bc8dfcb80cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20F=C3=A4rnstrand?= Date: Fri, 22 Mar 2024 13:27:43 +0100 Subject: [PATCH 3/4] Upgrade Android build container to new rust 1.77 based one --- building/android-container-image.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/building/android-container-image.txt b/building/android-container-image.txt index 87fdd82c32aa..64af5b38b71f 100644 --- a/building/android-container-image.txt +++ b/building/android-container-image.txt @@ -1 +1 @@ -ghcr.io/mullvad/mullvadvpn-app-build-android:169361256 +ghcr.io/mullvad/mullvadvpn-app-build-android:8fecd91cb From 5104a7a584b4a6e98645c756038facfb807dca16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20F=C3=A4rnstrand?= Date: Fri, 22 Mar 2024 13:47:18 +0100 Subject: [PATCH 4/4] Bump "rust-version" to 1.77 since the containers use that now --- Cargo.toml | 2 +- test/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 81efa9b85c17..91c39f351020 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ authors = ["Mullvad VPN"] repository = "https://github.com/mullvad/mullvadvpn-app/" license = "GPL-3.0" edition = "2021" -rust-version = "1.75.0" +rust-version = "1.77.0" [workspace] resolver = "2" diff --git a/test/Cargo.toml b/test/Cargo.toml index 0fd7b4a2e97e..363c12a1a817 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -3,7 +3,7 @@ authors = ["Mullvad VPN"] repository = "https://github.com/mullvad/mullvadvpn-app/" license = "GPL-3.0" edition = "2021" -rust-version = "1.75.0" +rust-version = "1.77.0" [workspace] resolver = "2"