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

[scripts-audit] minor vcpkg_from_* fixes #19657

Merged
merged 3 commits into from
Mar 18, 2022

Conversation

strega-nil
Copy link
Contributor

Fixes #19651

Fixes an issue reported by @Neumann-A

@Neumann-A
Copy link
Contributor

closes #19656

@strega-nil-ms
Copy link
Contributor

cc @Neumann-A for re-review

@JackBoosY JackBoosY added category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly info:internal This PR or Issue was filed by the vcpkg team. labels Aug 20, 2021
@cenit
Copy link
Contributor

cenit commented Aug 20, 2021

what about an e2e test for a small port downloaded using --head?

Copy link
Contributor

@Neumann-A Neumann-A left a comment

Choose a reason for hiding this comment

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

Would also like to see tests for this. E.g. a port which always calls vcpkg_from_ with two different urls and fetch_ref with --head and without --head to avoid such problems in the future.

@Neumann-A
Copy link
Contributor

There seems to be another bug. My Qt6 update script nolonger works:
Error:
fatal: not a tree object: a3d8d79fbdb776f8848cba2d721ee89c28cf2e50

CMake Error at scripts/cmake/vcpkg_execute_required_process.cmake:127 (message):
    Command failed: "C:/Program Files/Git/mingw64/bin/git.exe" archive a3d8d79fbdb776f8848cba2d721ee89c28cf2e50 -o E:/vcpkg_cache/downloads/temp/qtbase-v6.2.0-beta3.tar.gz
    Working Directory: E:/vcpkg_cache/downloads/git-tmp
    Error code: 128
    See logs for more information:
      E:\qt6-update\buildtrees\qtbase\git-archive-err.log

From the repo:
tag name v6.2.0-beta3 (a3d8d79fbdb776f8848cba2d721ee89c28cf2e50); tagged object commit ff31815659...

@strega-nil-ms
Copy link
Contributor

@Neumann-A yep, thanks!

@Neumann-A
Copy link
Contributor

@strega-nil-ms seems to work now

@sylveon
Copy link
Contributor

sylveon commented Aug 20, 2021

Installing --head packages used to work if patches didn't apply to the HEAD commit. When this branch is checked out and used, patches that don't apply fail to install even with --head.

@strega-nil-ms
Copy link
Contributor

@sylveon when did that work? I don't see a time in the history where this worked.

@sylveon
Copy link
Contributor

sylveon commented Aug 20, 2021

I can't pinpoint an exact time, but I used to be able to do vcpkg install --head detours despite the patch not applying correctly on latest HEAD for a while.

@sylveon
Copy link
Contributor

sylveon commented Aug 20, 2021

It worked back on July 7th: https://dev.azure.com/sylve0n/TranslucentTB/_build/results?buildId=140&view=logs&j=adc611be-d2d6-58a9-dbb6-278cbdb63baf&t=8cc718aa-4559-5f95-5b2c-3aeac298898c

The patch was already broken prior to that, and no new commit to the Detours repo since then would have broken it (if it wasn't already).

@strega-nil-ms
Copy link
Contributor

strega-nil-ms commented Aug 20, 2021

@sylveon even back to 2018, we patched head versions (and did not pass QUIET to vcpkg_apply_patches)... so it's weird that it worked.

edit: ah yup! we added a SKIP_PATCH_CHECK to vcpkg_from_github at some point.

@strega-nil-ms
Copy link
Contributor

@sylveon thanks for pointing that out!

@strega-nil-ms
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@cenit
Copy link
Contributor

cenit commented Aug 28, 2021

Copy link
Member

@BillyONeal BillyONeal left a comment

Choose a reason for hiding this comment

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

Thanks for tests!

scripts/cmake/vcpkg_from_git.cmake Outdated Show resolved Hide resolved
scripts/cmake/vcpkg_from_git.cmake Show resolved Hide resolved
@strega-nil-ms
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@strega-nil-ms
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@strega-nil-ms
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • scripts/test_ports/vcpkg-from-git-test/vcpkg.json

Valid values for the license field can be found in the documentation

@JackBoosY JackBoosY linked an issue Feb 21, 2022 that may be closed by this pull request
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • scripts/test_ports/vcpkg-from-git-test/vcpkg.json

Valid values for the license field can be found in the documentation

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • scripts/test_ports/vcpkg-from-git-test/vcpkg.json

Valid values for the license field can be found in the documentation

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • scripts/test_ports/vcpkg-from-git-test/vcpkg.json

Valid values for the license field can be found in the documentation

@strega-nil-ms
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@strega-nil-ms strega-nil-ms merged commit 7dd2e65 into microsoft:master Mar 18, 2022
@strega-nil-ms
Copy link
Contributor

baruch hashem! finally merged @Neumann-A

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly info:internal This PR or Issue was filed by the vcpkg team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[vcpkg_from_git] FETCH_REF not correctly working installing package head versions is now broken
9 participants