diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2025-07-09 14:24:34 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2025-07-09 14:24:34 +0200 |
| commit | 460925e4c014e0ded92131851a1195cbf784cc72 (patch) | |
| tree | 9b54e08c7dfd474a91b2212a3503ca91a756a638 | |
| parent | bef9cb8441e1369865ff345550ebb9c528dd3aca (diff) | |
| parent | 2c7246ddc941178cfe995f0e40b4cf4ddf62ba15 (diff) | |
| download | mullvadvpn-460925e4c014e0ded92131851a1195cbf784cc72.tar.xz mullvadvpn-460925e4c014e0ded92131851a1195cbf784cc72.zip | |
Merge branch 'upgrade-rust-1.88.0'
| -rw-r--r-- | .github/workflows/testframework.yml | 3 | ||||
| -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-- | rust-toolchain.toml | 2 | ||||
| -rw-r--r-- | test/Cargo.toml | 2 |
7 files changed, 9 insertions, 6 deletions
diff --git a/.github/workflows/testframework.yml b/.github/workflows/testframework.yml index 630152cb02..1061d0599d 100644 --- a/.github/workflows/testframework.yml +++ b/.github/workflows/testframework.yml @@ -103,6 +103,9 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 + - name: Install Rust target + run: rustup target add x86_64-pc-windows-gnu + - name: Build test runner working-directory: test run: cargo build --release --locked -p test-runner --target x86_64-pc-windows-gnu diff --git a/Cargo.toml b/Cargo.toml index c6eb50d5f1..e6c6d1eb04 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ repository = "https://github.com/mullvad/mullvadvpn-app/" license = "GPL-3.0" edition = "2021" # Must be less than or equal to `channel` in `rust-toolchain.toml` -rust-version = "1.83.0" +rust-version = "1.88.0" [workspace] resolver = "2" diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile index 7bdc61da00..3fe4e000cf 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:85fa990a4 +FROM ghcr.io/mullvad/mullvadvpn-app-build:c099f08f8 # === 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 524e9e3d06..c4e04625fd 100644 --- a/building/android-container-image.txt +++ b/building/android-container-image.txt @@ -1 +1 @@ -ghcr.io/mullvad/mullvadvpn-app-build-android:c0be9ab4b +ghcr.io/mullvad/mullvadvpn-app-build-android:a63a949cc diff --git a/building/linux-container-image.txt b/building/linux-container-image.txt index d51dc5b95a..54c57acf4e 100644 --- a/building/linux-container-image.txt +++ b/building/linux-container-image.txt @@ -1 +1 @@ -ghcr.io/mullvad/mullvadvpn-app-build:85fa990a4 +ghcr.io/mullvad/mullvadvpn-app-build:c099f08f8 diff --git a/rust-toolchain.toml b/rust-toolchain.toml index efba5d8d0f..20c1b58001 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] # Must be greater than or equal to `rust-version` in `Cargo.toml` -channel = "1.83.0" +channel = "1.88.0" diff --git a/test/Cargo.toml b/test/Cargo.toml index 26e716df24..7717a9229a 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.83.0" +rust-version = "1.88.0" [workspace] resolver = "2" |