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

Fix CI: Upgrade Python, Conan, ConanPackageTools #415

Merged
merged 12 commits into from
Jun 9, 2022
Merged

Conversation

nickpdemarco
Copy link
Member

@nickpdemarco nickpdemarco commented Jun 9, 2022

Miscellaneous CI cleanup. We can now format matrix.json for readability. A simple python script will flatten it before GH actions sees it. Otherwise, just straightforward tooling dependency updates.

Note: I tried to upgrade our windows targets from (windows-2016, windows-2019) to (windows-2019, windows-2022). Conan errored out early in the latter. But this should be on our radar - windows-2016 is deprecated on GH actions and will fail periodically to remind us of this fact.

@nickpdemarco nickpdemarco marked this pull request as draft June 9, 2022 15:25
@nickpdemarco nickpdemarco changed the title Try to fix CI with Python Bump to 3.9.6 Fix CI: Upgrade Python, Conan, ConanPackageTools Jun 9, 2022
@nickpdemarco
Copy link
Member Author

Note that the two failing checks are both from appveyor. I have disabled those webhooks in our settings and intend to remove them altogether when this PR is merged.

@@ -53,7 +56,8 @@ jobs:
python.exe --version
cmake --version
python.exe -m pip install --upgrade pip
pip.exe install conan_package_tools==0.37.0
pip.exe install markupsafe==2.0.1
Copy link
Member Author

Choose a reason for hiding this comment

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

See conan-io/conan#10611. I could not find a more appropriate workaround than this. Conan will fail if this dependency is not available.

@nickpdemarco nickpdemarco marked this pull request as ready for review June 9, 2022 18:28
"os": "macos-10.15"
},
{
Copy link
Member

Choose a reason for hiding this comment

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

We should consider to add VS 2022.

Copy link
Member Author

Choose a reason for hiding this comment

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

I tried. Conan died with a non obvious error. I think adding that will have to be a separate task.

Copy link
Member

Choose a reason for hiding this comment

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

OK. Then later

@FelixPetriconi FelixPetriconi merged commit 432e977 into main Jun 9, 2022
@FelixPetriconi FelixPetriconi deleted the demarco/ci-fix branch June 9, 2022 20:02
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