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

Embed vcpkg configuration in manifest #239

Merged
merged 17 commits into from
Nov 4, 2021

Conversation

vicroms
Copy link
Member

@vicroms vicroms commented Oct 29, 2021

Allows specifying vcpkg configuration in manifest files.

The configuration is passed via a vcpkg-configuration object in the manifest file.
Having a vcpkg-configuration block in vcpkg.json while also having a vcpkg-configuration.json file is not allowed.

As a drive-by format-manifest has been changed to allow the configuration blocks.

Example:

{
  "vcpkg-configuration": {
    "registries": [
      {
        "kind": "git",
        "baseline": "dacf4de488094a384ca2c202b923ccc097956e0c",
        "repository": "https://github.com/northwindtraders/vcpkg-registry",
        "packages": [ "beicode", "beison" ]
      }
    ]
  },
  "name": "test",
  "version": "1.0.0",
  "dependencies": [ "beison", "zlib" ]
}

@vicroms vicroms requested review from strega-nil-ms, ras0219-msft and BillyONeal and removed request for strega-nil-ms and ras0219-msft October 29, 2021 02:23
Copy link
Contributor

@strega-nil-ms strega-nil-ms left a comment

Choose a reason for hiding this comment

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

(I understand that putting this under a $ makes it so you don't have to modify manifest parsing code, but it shouldn't be too much work - two lines changed, I think)

src/vcpkg/vcpkgpaths.cpp Outdated Show resolved Hide resolved
src/vcpkg/vcpkgpaths.cpp Outdated Show resolved Hide resolved
src/vcpkg/vcpkgpaths.cpp Outdated Show resolved Hide resolved
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.

nit nit nit nit

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.

In the 1PM meeting we resolved this as "no x-" and we'll warn about it.

@vicroms vicroms marked this pull request as ready for review November 2, 2021 23:26
src/vcpkg/vcpkgpaths.cpp Outdated Show resolved Hide resolved
@vicroms
Copy link
Member Author

vicroms commented Nov 3, 2021

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@vicroms vicroms merged commit 57708d0 into microsoft:main Nov 4, 2021
@vicroms vicroms deleted the embed-vcpkg-configuration-in-manifest branch November 4, 2021 05: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.

4 participants