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

Codechange: [CI] manually install vcpkg for all targets #12241

Merged
merged 1 commit into from Mar 9, 2024

Conversation

TrueBrain
Copy link
Member

Motivation / Problem

From macos-14, vcpkg is no longer installed on the runner-image. It stands to reason that this will also roll out to new images for other OSes. To be pre-emptive about it, start using our own cloned vcpkg for all targets.

It is better to have all targets work the same, than some exceptions here, some exceptions there. Lowers the maintenance burden on our end.

Description

Use our own vcpkg for all targets.

PS: release-linux already did use its own vcpkg.

Limitations

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR touches english.txt or translations? Check the guidelines
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, game_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

@TrueBrain TrueBrain marked this pull request as draft March 9, 2024 10:58
@TrueBrain TrueBrain added the backport requested This PR should be backport to current release (RC / stable) label Mar 9, 2024
@TrueBrain TrueBrain marked this pull request as ready for review March 9, 2024 11:45
@TrueBrain
Copy link
Member Author

Build release results:
https://github.com/TrueBrain/OpenTTD/actions/runs/8214264751/job/22466567424

This shows that the non-system vcpkg is now being used by all targets :)

rubidium42
rubidium42 previously approved these changes Mar 9, 2024
Copy link
Contributor

@rubidium42 rubidium42 left a comment

Choose a reason for hiding this comment

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

Looks okay to me

From macos-14, vcpkg is no longer installed on the runner-image.
It stands to reason that this will also roll out to new images
for other OSes. To be pre-emptive about it, start using our own
cloned vcpkg for all targets.
@TrueBrain TrueBrain merged commit 04ce1c0 into OpenTTD:master Mar 9, 2024
20 checks passed
@TrueBrain TrueBrain deleted the ci-vcpkg branch March 9, 2024 14:03
Kuhnovic pushed a commit to Kuhnovic/OpenTTD that referenced this pull request Mar 9, 2024
From macos-14, vcpkg is no longer installed on the runner-image.
It stands to reason that this will also roll out to new images
for other OSes. To be pre-emptive about it, start using our own
cloned vcpkg for all targets.
michicc pushed a commit to Kuhnovic/OpenTTD that referenced this pull request Mar 9, 2024
From macos-14, vcpkg is no longer installed on the runner-image.
It stands to reason that this will also roll out to new images
for other OSes. To be pre-emptive about it, start using our own
cloned vcpkg for all targets.
Kuhnovic pushed a commit that referenced this pull request Mar 11, 2024
From macos-14, vcpkg is no longer installed on the runner-image.
It stands to reason that this will also roll out to new images
for other OSes. To be pre-emptive about it, start using our own
cloned vcpkg for all targets.
@Kuhnovic Kuhnovic added backported This PR is backported to a current release (RC / stable) and removed backport requested This PR should be backport to current release (RC / stable) labels Mar 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backported This PR is backported to a current release (RC / stable)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants