-
Notifications
You must be signed in to change notification settings - Fork 6.6k
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
[boost] fix clang-cl builds #26337
[boost] fix clang-cl builds #26337
Conversation
Hmm forgot to commit some changes. No wonder it fails. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
PRs must add only one version and must not modify any published versions
When making any changes to a library, the version or port-version in vcpkg.json
or CONTROL
must be modified.
warning: checked-in files for boost-modular-build-helper are unchanged from version 1.79.0#8
-- SHA: 49c55d3f9e048f5b2260ab96c46fbcb1d5ec6cbc
-- Did you remember to commit your changes?
***No files were updated***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout d293ac220dd126165d24907b6f07e6b658b3329f -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 6d7bffe..c7fefa3 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -842,7 +842,7 @@
},
"boost-modular-build-helper": {
"baseline": "1.79.0",
- "port-version": 8
+ "port-version": 9
},
"boost-move": {
"baseline": "1.79.0",
@Neumann-A Could you please resolve the conflicts? |
# Conflicts: # ports/boost-modular-build-helper/vcpkg.json # versions/b-/boost-modular-build-helper.json # versions/baseline.json
f6bb5eb
…t-clang_cl # Conflicts: # versions/b-/boost-modular-build-helper.json
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
PRs must add only one version and must not modify any published versions
When making any changes to a library, the version or port-version in vcpkg.json
or CONTROL
must be modified.
error: unable to parse versions file /home/runner/work/vcpkg/vcpkg/versions/b-/boost-modular-build-helper.json
Error: failed to parse versions file for `boost-modular-build-helper`: error: Unexpected character; expected property name
on expression: <<<<<<< HEAD
^
Ping @JavierMatosD for response, could you please review this PR? |
# Conflicts: # ports/boost-modular-build-helper/vcpkg.json # versions/b-/boost-modular-build-helper.json # versions/baseline.json
4a416c0
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM with the requested change. Thanks for the PR!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
PRs must add only one version and must not modify any published versions
When making any changes to a library, the version or port-version in vcpkg.json
or CONTROL
must be modified.
error: checked-in files for boost-modular-build-helper have changed but the version was not updated
version: 1.80.0#4
old SHA: 08a56d3b1ad17e490ed98496212d2bf643269fb8
new SHA: 03e1c57dc2673ac738dfb3b30587bb5480bfcf8b
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 2de7f388c5aac1f7d63c5986fe9b1b60e7d6bbb5 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/b-/boost-atomic.json b/versions/b-/boost-atomic.json
index 48b1fb0..1c84d99 100644
--- a/versions/b-/boost-atomic.json
+++ b/versions/b-/boost-atomic.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "0bd17df0244444239b8faeb8c40605b1f82af2de",
+ "version": "1.80.0",
+ "port-version": 2
+ },
{
"git-tree": "d5d96b1e0077d3b92de462eff308f45327774bb5",
"version": "1.80.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index f78f470..20d2d37 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -594,7 +594,7 @@
},
"boost-atomic": {
"baseline": "1.80.0",
- "port-version": 1
+ "port-version": 2
},
"boost-beast": {
"baseline": "1.80.0",
Ok this fixes boost builds but doesn't fix |
bonus: will also fix synchronization.lib problems.