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

Jump to bottom

Bump MSRV to 1.61.0 #3809

Merged
merged 1 commit into from
Dec 4, 2022
Merged

Bump MSRV to 1.61.0 #3809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,19 +77,19 @@ jobs:
include:
# Currently used Rust version, same as in `rust-toolchain` file.
- os: ubuntu-latest
rust: 1.61.0
rust: 1.65.0
python: 3.9
- os: windows-latest
rust: 1.61.0
rust: 1.65.0
python: false # Python bindings compilation on Windows is not supported.

# Minimum Supported Rust Version = 1.57.0
# Minimum Supported Rust Version = 1.61.0
#
# Minimum Supported Python Version = 3.7
# This is the minimum version for which manylinux Python wheels are
# built.
- os: ubuntu-latest
rust: 1.57.0
rust: 1.61.0
python: 3.7
runs-on: ${{ matrix.os }}
steps:
Expand Down
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 @@ -4,7 +4,7 @@ version = "1.102.0"
authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
edition = "2021"
license = "MPL-2.0"
rust-version = "1.57"
rust-version = "1.61"

[profile.dev]
debug = 0
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.61.0
1.65.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if we are testing the msrv why not delete this file and let us always develop against the latest version? The ci.yml could then also use stable instead of having to code this version in.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is currently used by deltachat-android build tools and scripts, I don't want to break them right now: https://github.com/deltachat/deltachat-android/blob/master/scripts/install-toolchains.sh and https://github.com/deltachat/deltachat-android/blob/master/scripts/ndk-make.sh

It ensures that we always know which version of Rust is currently used for android builds at least.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I personally just use whatever rust comes from the distro repositories, without rustup.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

huh, interesting. which distro do you use that it gives you a good enough rust setup?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Arch Linux has rust 1.65 in the repository, various cargo plugins and also a rustup package if you really need it.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But also Debian sid has a recent enough version usually in sid, it's 1.62 currently, still good enough to compile deltachat-core-rust after this change.

2 changes: 1 addition & 1 deletion scripts/coredeps/install-rust.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -euo pipefail
#
# Avoid using rustup here as it depends on reading /proc/self/exe and
# has problems running under QEMU.
RUST_VERSION=1.61.0
RUST_VERSION=1.65.0

ARCH="$(uname -m)"
test -f "/lib/libc.musl-$ARCH.so.1" && LIBC=musl || LIBC=gnu
Expand Down