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.

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

Repair build on nightly and new MSRV 1.81 #2582

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

naseschwarz
Copy link
Contributor

@naseschwarz naseschwarz commented Mar 25, 2025

Currently, nightly and MSRV builds don't activate their respective toolchains. Thus, MSRV and nightly builds are broken.

This is just a draft enabling the toolchains for now until the builds are fixed, too.

Current state:

  • Restore all builds for nightly and 1.70 on all architectures
  • Fix nightly builds
  • Fix 1.70 builds or agree on higher MSRV
  • Fix weird windows nightly test issue

This Pull Request fixes/closes #2094

It changes the following:

  • Actually installs and activates toolchain for CI builds for nightly and MSRV
  • Increases MSRV to 1.81
  • Fixes or disables clippy issues from now working nightly builds

I followed the checklist:

  • I added unittests N/A
  • I ran make check without errors -> CI
  • I tested the overall application
    • On 1.81
    • On stable
    • On nightly
  • I added an appropriate item to the changelog

@naseschwarz naseschwarz marked this pull request as draft March 25, 2025 07:53
@naseschwarz naseschwarz changed the title ci: Actually use toolchain ci: Actually use toolchain when testing nightly and MSRV Mar 25, 2025
@naseschwarz naseschwarz changed the title ci: Actually use toolchain when testing nightly and MSRV ci: Actually use toolchain for nightly and MSRV runs Mar 25, 2025
@naseschwarz naseschwarz force-pushed the build-msrv branch 2 times, most recently from 2101dc8 to cb7049e Compare March 27, 2025 08:52
Somehow at some point, additional rust toolchains became available in
CI. Thus, it's no longer sufficient to install the matrix toolchain, but
actually override it for the build directory.
@naseschwarz naseschwarz changed the title ci: Actually use toolchain for nightly and MSRV runs Repair build on nightly and MSRV Mar 27, 2025
@naseschwarz
Copy link
Contributor Author

naseschwarz commented Mar 27, 2025

If I'm not missing something, there'll be a lot of dependency downgrades if we want to keep the MSRV at 1.70, including at least a rustsec unmaintained advisory and other complications.

@extrawurst: Is an MSRV at 1.70 just a nice-to-have or something we should strive for? I agree that 1.70 is a reasonable default, but as seeing the state of the dependencies I'm not sure it's worth going for.

gitui's actual MSRV is 1.81 for the time being.

@extrawurst
Copy link
Collaborator

Yeah let's upgrade the MSRV, that will unlock a lot of nice things and it was originally for Debian but keeping compatibility with its off-the-shelve rust version is insane. I am willing to give up on that. people have to install a rust toolchain anyway for getting anything recent to build on it :)

@naseschwarz naseschwarz deleted the build-msrv branch March 27, 2025 09:57
@naseschwarz naseschwarz restored the build-msrv branch March 27, 2025 09:57
@naseschwarz naseschwarz reopened this Mar 27, 2025
@naseschwarz naseschwarz changed the title Repair build on nightly and MSRV Repair build on nightly and new MSRV 1.81 Mar 27, 2025
@naseschwarz
Copy link
Contributor Author

Testing on windows-nightly fails, but this is affected by #2483 anyhow. After merging #2483 into this branch, the test would succeed. I'll be delaying this PR until #2483 is merged.

@naseschwarz naseschwarz mentioned this pull request Apr 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants