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

Downgrade Rust used to build releases #6346

Merged
merged 3 commits into from
Dec 17, 2024
Merged

Downgrade Rust used to build releases #6346

merged 3 commits into from
Dec 17, 2024

Conversation

link2xt
Copy link
Collaborator

@link2xt link2xt commented Dec 17, 2024 •
edited
Loading

Workaround for #6338

@link2xt
Copy link
Collaborator Author

link2xt commented Dec 17, 2024

With this nix build .#deltachat-rpc-server-win64 produces binary that passes the checks: https://www.virustotal.com/old-browsers/file/26085e5ca840ecba635514e213bb47565219c49ea94e7401dd311b74b23c1aa4

@link2xt link2xt mentioned this pull request Dec 17, 2024
Open
@iequidoo
Copy link
Collaborator

Maybe add a branch to build win64 releases from it? And only merge fixes and everything else easily mergeable there.

@link2xt
Copy link
Collaborator Author

link2xt commented Dec 17, 2024

I don't want to build win64 releases differently from win32 and Linux and macOS releases. If we have to downgrade Rust then can as well downgrade it for all targets, this blocks iroh upgrade anyway. We are not going to ship old iroh for win64 and new iroh for linux or something like this.

@link2xt
Revert "build: increase MSRV to 1.81.0"
9d33148 
This reverts commit ffe6efe.
@link2xt
build: downgrade Rust version used to build binaries
d822da3 
This fixes the problem of VirusTotal
reporting the binaries built with
`nix build .#deltachat-rpc-server-win64`
as malware.
@link2xt link2xt force-pushed the link2xt/nix-downgrade-rust branch from d176c4c to d822da3 Compare December 17, 2024 17:21
@link2xt
Copy link
Collaborator Author

link2xt commented Dec 17, 2024

I reverted rustyline update on main and rebased this on top of 1.152.0 tag. Once CI passes going to merge this with a proper merge commit into main and tag 1.152.1 as 1.152.0 + these commits without any changes that came later. So 1.152.1 will be exactly 1.152.0 but built with downgraded Rust.

Then any new releases will be built with downgraded Rust and once the issue resolves we can restore MSRV upgrade and rustyline upgrade commits.

hpk42
hpk42 approved these changes Dec 17, 2024
View reviewed changes
Copy link
Contributor

@hpk42 hpk42 left a comment

Choose a reason for hiding this comment

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

this is actually less involved than i feared. thanks for tackling!

@link2xt link2xt force-pushed the link2xt/nix-downgrade-rust branch from 8b143ff to 5069b58 Compare December 17, 2024 18:27
@link2xt link2xt merged commit 67e16d0 into main Dec 17, 2024
73 checks passed
@link2xt link2xt deleted the link2xt/nix-downgrade-rust branch December 17, 2024 19:21
@dignifiedquire
Copy link
Member

fyi rpgp is upgrading to msrv 1.81 for the next release as well

@nicodh nicodh mentioned this pull request Dec 17, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iequidoo iequidoo iequidoo approved these changes

@hpk42 hpk42 hpk42 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@link2xt @iequidoo @dignifiedquire @hpk42