-
Notifications
You must be signed in to change notification settings - Fork 6.5k
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
[rollup:2021-08-09] Rollup PR #19469
[rollup:2021-08-09] Rollup PR #19469
Conversation
strega-nil-ms
commented
Aug 9, 2021
- [rollup:2021-08-09] PR [scripts-audit] vcpkg_fixup_pkgconfig #19348 (@strega-nil)
- [rollup:2021-08-09] PR [tinyfiledialogs] Fix for good #19338 (@strega-nil)
- [rollup:2021-08-09] PR [scripts-audit] vcpkg_find_fortran #19239 (@strega-nil)
- [rollup:2021-08-09] PR [scripts-audit] vcpkg_download_distfile #19238 (@strega-nil)
- [rollup:2021-08-09] PR [vcpkg_fixup_cmake_targets] Fix up OSX system development path #16706 (@JackBoosY)
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: Local changes detected for vcpkg-cmake-config but no changes to version or port version.
-- Version: 2021-05-22#1
-- Old SHA: 330cc51bc99c6b71ed5fb51901f6f838684015a5
-- New SHA: 791ff9abbc9720842f09dda6d4b5f07a1269b21b
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
20c30d6
to
82c6b84
Compare
|
[vcpkg_fixup_cmake_targets] Fix up OSX system development path
[scripts-audit] vcpkg_download_distfile
[scripts-audit] vcpkg_find_fortran
[tinyfiledialogs] Fix for good
[scripts-audit] vcpkg_fixup_pkgconfig
f1bc931
to
e82fa28
Compare
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!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 69478c5caafcde4c490bb1fccb960296801dbb5f -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/v-/vcpkg-cmake-config.json b/versions/v-/vcpkg-cmake-config.json
index d1ec441..affac6b 100644
--- a/versions/v-/vcpkg-cmake-config.json
+++ b/versions/v-/vcpkg-cmake-config.json
@@ -5,11 +5,6 @@
"version-date": "2021-08-11",
"port-version": 0
},
- {
- "git-tree": "279b4eab772c3c922b5880204647079b14f6d349",
- "version-date": "2021-05-22",
- "port-version": 2
- },
{
"git-tree": "330cc51bc99c6b71ed5fb51901f6f838684015a5",
"version-date": "2021-05-22",
e82fa28
to
a982a7e
Compare
Sorry for the reset of a world rebuild :(. Pushed merge with master to shut down the older VMs and to get the fix for embree which we know would fail here anyway after there was an existing Linux failure. |
Merging since gdal was failing with this already, and the paraview failure isn't caused by this either. |
gdal fails due to a pc file issue with libcurl. This is new. Curl was updated recently without failures in gdal. So I assume the pkgconfig fixup is broken now.
Empty elements? |
[rollup:2021-08-09] Rollup PR (microsoft#19469)
[vcpkg_fixup_pkgconfig] HOTFIX -- revert microsoft#19469 (microsoft#19607)
function(z_vcpkg_download_distfile_test_hash path kind error_advice sha512 skip_sha512) | ||
if(_VCPKG_INTERNAL_NO_HASH_CHECK) | ||
# When using the internal hash skip, do not output an explicit message. | ||
return() | ||
endif() | ||
if(skip_sha512) | ||
message(STATUS "Skipping hash check for ${file_path}.") | ||
return() | ||
endif() | ||
|
||
file(SHA512 "${path}" file_hash) | ||
if(NOT "${file_hash}" STREQUAL "${sha512}") | ||
message(FATAL_ERROR | ||
"\nFile does not have expected hash:\n" | ||
" File path: [ ${file_path} ]\n" | ||
" Expected hash: [ ${sha512} ]\n" | ||
" Actual hash: [ ${file_hash} ]\n" | ||
"${CUSTOM_ERROR_ADVICE}\n") | ||
endif() | ||
endfunction() |
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.
Some parameters are incorrect here:
- kind
- error_advice
- sha512
- skip_sha512
These args are not used or not be passed.