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

[node][opengl-2] Update vcpkg so windows builds in workflow can succeed #1940

Merged
merged 2 commits into from
Dec 10, 2023

Conversation

acalcutt
Copy link
Collaborator

@acalcutt acalcutt commented Dec 9, 2023

This PR updates vcpkg in the 'opengl-2' to match the main branch. This is needed for the windows node builds to succeed

This is a cherry pick of two commits which touch vcpkg

  • Update vcpkg to e65af7b (#1433)
  • [Windows] Update libwebp (#1662)

there are a few other commits that update vcpkg in main, but they get superseded by the two PRs above, so they don't need to be included.

@ntadej
Copy link
Collaborator

ntadej commented Dec 9, 2023

Hmm, I guess I could merge this as is, but is the CI expected to use Node 21 already?

I guess you can't enable the Node CI for all platforms first as this change is not really tested by anything now.

@acalcutt acalcutt changed the title Update vcpkg so windows builds in workflow can succeed [node][opengl-2] Update vcpkg so windows builds in workflow can succeed Dec 9, 2023
@acalcutt
Copy link
Collaborator Author

acalcutt commented Dec 9, 2023

This PR doesn't matter the version of node, the vcpkg update is just so the the windows build can work again. right now it fails in this branch, but the vcpkg update fixes that.

For the node 21 question, we have only ever published even stable releases, so before we published 14, 16, 18. In #1941 it has been updated to node 16, 18, 20 . I also considered keeping this on Ubuntu 20.04 , but the self hosted arm64 runner has already been update and we no longer have a linux 20.04 arm64 to build on.

@acalcutt
Copy link
Collaborator Author

acalcutt commented Dec 9, 2023

Without the vcpkg update it gets this error
https://github.com/WifiDB/maplibre-native/actions/runs/7148148808/job/19468776378

@acalcutt
Copy link
Collaborator Author

acalcutt commented Dec 9, 2023

I think the CI that is failing is actually 'node-ci-mac.yml' , which also has the name 'node-ci' . that name being the same lead to some confusion in testing.

Looking at what is failing, I think this will work again after #1941 , which has the updates that allow node 20/21 to build.

@ntadej
Copy link
Collaborator

ntadej commented Dec 9, 2023

I can't seem to rebase the MR like I usually can on main. Can you please do it manually?

@acalcutt
Copy link
Collaborator Author

I think this should be re-based now, and all checks but the macos arm64 one we are aware of have passed

@ntadej ntadej merged commit dd31976 into maplibre:opengl-2 Dec 10, 2023
13 of 14 checks passed
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.

3 participants