diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2024-03-22 14:33:42 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2024-03-22 14:33:42 +0100 |
| commit | 716389914bbc7d523c172e241c33136edebcb382 (patch) | |
| tree | c380568ebbafb97c0ba89b48f734d07c02b347c6 | |
| parent | 0bda1107d189189298aaf989baa13d4099f7c164 (diff) | |
| parent | 5104a7a584b4a6e98645c756038facfb807dca16 (diff) | |
| download | mullvadvpn-716389914bbc7d523c172e241c33136edebcb382.tar.xz mullvadvpn-716389914bbc7d523c172e241c33136edebcb382.zip | |
Merge branch 'upgrade-build-containers'
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | android/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | building/android-container-image.txt | 2 | ||||
| -rw-r--r-- | building/linux-container-image.txt | 2 | ||||
| -rw-r--r-- | test/Cargo.toml | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Cargo.toml b/Cargo.toml index 81efa9b85c..91c39f3510 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/android/docker/Dockerfile b/android/docker/Dockerfile index 2fb78c2afb..1ed9a1ccdc 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 diff --git a/building/android-container-image.txt b/building/android-container-image.txt index 87fdd82c32..64af5b38b7 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 diff --git a/building/linux-container-image.txt b/building/linux-container-image.txt index f9109d9414..5c4f7bc811 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 diff --git a/test/Cargo.toml b/test/Cargo.toml index 0fd7b4a2e9..363c12a1a8 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" |