Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade build containers to use Rust 1.77 #6010

Merged
merged 4 commits into from
Mar 22, 2024
Merged

Upgrade build containers to use Rust 1.77 #6010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f29eeef
Update Android dockerfile to use newer base image
Mar 22, 2024
eaa5717
Bump Linux build container to new Rust 1.77 based one
faern Mar 22, 2024
2c98ccb
Upgrade Android build container to new rust 1.77 based one
faern Mar 22, 2024
5104a7a
Bump "rust-version" to 1.77 since the containers use that now
faern Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion android/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion building/android-container-image.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ghcr.io/mullvad/mullvadvpn-app-build-android:169361256
ghcr.io/mullvad/mullvadvpn-app-build-android:8fecd91cb
2 changes: 1 addition & 1 deletion building/linux-container-image.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ghcr.io/mullvad/mullvadvpn-app-build:1b882ccbc
ghcr.io/mullvad/mullvadvpn-app-build:01a98bb5b
2 changes: 1 addition & 1 deletion test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading