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

add support for vcpkg-configuration.json's baseline #216

Merged
merged 1 commit into from
Dec 28, 2023

Conversation

lukka
Copy link
Owner

@lukka lukka commented Nov 25, 2023

Changes:

  • the vcpkgGitCommitId input is optional, and the Git commit id can be fetched from :
    • vcpkg-configuration.json:
      - the file is searched with provided glob expression in vcpkgConfigurationJsonGlob input.
      - the baseline is searched using JSONPath $["default-registry"]["baseline"]
    • vcpkg.json:
      - the file is searched as usual/already (glob + ignore input).
      - the baseline is searched using JSONPaths (first hit wins):
      - $["builtin-baseline"]
      - $['vcpkg-configuration']['default-registry']['baseline']

Note: only the default-registry's builtin kind is supported, the kind git or filesystem are not supported.

@lukka lukka force-pushed the dev/vcpkgconfjson-support branch 3 times, most recently from 6f5b3dc to b9ce901 Compare November 25, 2023 22:13
@BurningEnlightenment
Copy link

I'm unsure where you discovered vcpkg.json > $['default-registry']['baseline'] its associated schema doesn't mention a default-registry key in the root object. Two additional test cases for the other two vcpkg.json based baseline searches would probably be useful.

Otherwise LGTM 👍

@lukka lukka force-pushed the dev/vcpkgconfjson-support branch 3 times, most recently from ad96ae6 to 5b3f345 Compare December 27, 2023 13:38
@lukka lukka merged commit 1737e22 into main Dec 28, 2023
22 checks passed
@lukka lukka deleted the dev/vcpkgconfjson-support branch January 7, 2024 13:43
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.

None yet

2 participants