Merge branch 'upgrade-build-containers'

faern · faern · commit 716389914bbc · 2024-03-22T14:33:42.000+01:00
diff --git 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/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
diff --git 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
diff --git 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
diff --git 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"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-ghcr.io/mullvad/mullvadvpn-app-build-android:169361256`
	`1`	`+ghcr.io/mullvad/mullvadvpn-app-build-android:8fecd91cb`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-ghcr.io/mullvad/mullvadvpn-app-build:1b882ccbc`
	`1`	`+ghcr.io/mullvad/mullvadvpn-app-build:01a98bb5b`