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

ci: improve readability and correctness #2941

Merged
merged 4 commits into from
Sep 6, 2024
Merged

ci: improve readability and correctness #2941

merged 4 commits into from
Sep 6, 2024

Conversation

cebtenzzre
Copy link
Member

It's getting hard to keep track of all of the incidental CI changes I'd like to make, which mostly seem to be in PRs that are blocked on something, so I am putting them here. Changes made:

  • MSVC builds should use Enter-VsDevShell to improve readability and make it easier to change MSVC versions. As commented in the script, I attempted this before and it didn't work. It turns out this was because I was missing -arch=x64, which is needed to get a compiler that runs as a 64-bit application (regardless of target platform).
  • The apt commands on Ubuntu were hard to edit as they were not wrapped at all. Also, some of them used apt and others used apt-get—use apt-get everywhere.
  • CMAKE_PREFIX_PATH on macOS cannot be ".../cmake/Qt6", or it doesn't do anything. It should just be ".../cmake". The location was inferred regardless, but if e.g. multiple Qt versions are installed, this won't work.

This should work with any recent version of Visual Studio. It didn't
work before because I was missing "-arch=x64" and got a 32-bit compiler
that likely couldn't address enough memory.

Signed-off-by: Jared Van Bortel <[email protected]>
These didn't seem to hurt, but they weren't helping either. This path
must be correct if multiple versions of Qt are installed.

Signed-off-by: Jared Van Bortel <[email protected]>
cebtenzzre added a commit that referenced this pull request Sep 5, 2024
@cebtenzzre cebtenzzre merged commit facb706 into main Sep 6, 2024
4 of 18 checks passed
@cebtenzzre cebtenzzre deleted the ci-fixes-sep2024 branch September 6, 2024 16:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants