fix: CI: Force use of Rust 1.77 #957
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This works around our CI issues on Windows, as they seem to have appeared with the 1.78 update See: KDAB#958
LeonMatthesKDAB
force-pushed
the
force-rust-1-77
branch
from
478c0b7 to
9bb0455
Compare
ahayzen-kdab
approved these changes
May 21, 2024
ahayzen-kdab
added a commit
to ahayzen-kdab/cxx-qt
that referenced
this pull request
May 24, 2024
This reverts commit 40f5ad1. We have changed to using an init method rather than whole-archive which fixes Windows CI.
ahayzen-kdab
added a commit
to ahayzen-kdab/cxx-qt
that referenced
this pull request
May 24, 2024
This reverts commit 40f5ad1. We have changed to using an init method rather than whole-archive which fixes Windows CI.
ahayzen-kdab
added a commit
to ahayzen-kdab/cxx-qt
that referenced
this pull request
May 24, 2024
This reverts commit 40f5ad1. We have changed to using an init method rather than whole-archive which fixes Windows CI.
ahayzen-kdab
added a commit
to ahayzen-kdab/cxx-qt
that referenced
this pull request
May 24, 2024
This reverts commit 40f5ad1. We have changed to using an init method rather than whole-archive which fixes Windows CI.
LeonMatthesKDAB
added a commit
to LeonMatthesKDAB/cxx-qt
that referenced
this pull request
Jun 20, 2024
This reverts commit 40f5ad1. We are now building and linking object files directly, which works nicely with CMake and seems to work for Rust as well.
ahayzen-kdab
added a commit
to ahayzen-kdab/cxx-qt
that referenced
this pull request
Jun 20, 2024
This reverts commit 40f5ad1. We have changed to using an init method rather than whole-archive which fixes Windows CI.
LeonMatthesKDAB
added a commit
that referenced
this pull request
Jun 27, 2024
* qt-build-utils: add resources to volatile workaround * Add cxxqt_import_qml_module to CMake This allows us to get away without whole-archive in CMake by declaring an OBJECT library instead. * Add cxxqt_import_crate * CMake: Use cxxqt_import_ functions everywhere * CMake: Add fake target to build required obj file Otherwise, Ninja will complain, as it needs **some** rule to build the target, even if that rule does nothing. * cxx-qt-build: Do not use -bins suffix of -link-arg This caused a build failure when not building a binary. Linking the object file in shouldn't produce issues. * build-utils: Only reference cachegen if it exists * Enable -x in scripts/check_cargo_build_rerun.sh And don't redirect the first build output to /dev/null This should allow us to see what exactly is failing in CI. * cmake: Automatically add a Qt5 compatibility target * fix: Close the std_types_qt5 file before compiling * Remove loop error that would accidentally add unwanted files to the init builders * cxx-qt-build: Refactor `build` method * Cxx-Qt-build: compile object file with -arg-bins * cxx-qt-build: specify -l to the staticlib manually Otherwise the linker order doesn't work out and the linker cannot resolve the qt_static_plugin_*** functions * qt-build-utils: Refactor to use std::fs::write It's much more concise than using File::create followed by write! * cxx-qt-build: Allow custom initializers in opts This can be used to e.g. register custom types, import plugins, declare modules, etc. * Revert "fix: CI: Force use of Rust 1.77 (#957)" This reverts commit 40f5ad1. We are now building and linking object files directly, which works nicely with CMake and seems to work for Rust as well. * clippy: Allow missing_safety_doc in nested_qobjects This may be a clippy bug, as `cargo expand` tells me the generated functions do indeed have a `# Safety` section in their documentation. The `# Safety` sections also show up in the output of `cargo doc`. So it's unclear why clippy is complaining. * cxx-qt-build: Include Qt5 support in initializers This way we don't need a separate object file and CMake target for this. * Incorporate feedback from Review Thanks to @ahayzen-kdab for the review. * Add a single initializers file per crate. This way we don't run into issues where multiple build scripts are writing to the same initializers file. --------- Co-authored-by: Andrew Hayzen <andrew.hayzen@kdab.com> Co-authored-by: Leon Matthes <leon@matthes.biz>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This may fix our CI issues on Windows, as they seem to have appeared with the 1.78 update