Skip to content

Update Windows build#1668

Merged
ajtribick merged 1 commit intomasterfrom
vcpkg
Apr 12, 2023
Merged

Update Windows build#1668
ajtribick merged 1 commit intomasterfrom
vcpkg

Conversation

@ajtribick
Copy link
Collaborator

@ajtribick ajtribick commented Apr 1, 2023 •
edited
Loading

  • Specify commit hash to use for vcpkg (currently this is the latest one to pick up the msys2 fix from [vcpkg] update msys2-runtime version to 3.4.6-1 microsoft/vcpkg#30546
  • Switch Windows scripts to PowerShell for consistency
  • Fix bug where qt5compat was installed on Qt5 builds (unset command doesn't exist - now using an array parameter instead)
  • Also set the API key on the Nuget repository

@ajtribick ajtribick force-pushed the vcpkg branch 4 times, most recently from 7cb3baf to cdba01c Compare April 1, 2023 18:55
@ajtribick ajtribick marked this pull request as draft April 1, 2023 19:19
@sonarqubecloud
Copy link

sonarqubecloud bot commented Apr 1, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@ajtribick ajtribick changed the title Don't install qt5compat in Qt5 installs Update Windows build Apr 2, 2023
@ajtribick ajtribick marked this pull request as ready for review April 2, 2023 08:22
@ajtribick ajtribick requested a review from a team April 2, 2023 08:23
@ajtribick ajtribick merged commit 0ae9041 into master Apr 12, 2023
@ajtribick ajtribick deleted the vcpkg branch April 12, 2023 09:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@375gnu 375gnu 375gnu 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.

2 participants

@ajtribick @375gnu