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

Teach x-ci-verify-versions to check that versions exist in the database #1210

Merged
merged 68 commits into from
Jun 22, 2024

Commits on Sep 19, 2023

  1. Configuration menu
    Copy the full SHA
    e7a6683 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    09e135c View commit details
    Browse the repository at this point in the history
  3. Fix merge conflict error.

    BillyONeal committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    4d8ca9e View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. Merge remote-tracking branch 'origin/main' into clarify-no-baseline-v…

    …s-error
    
    # Conflicts:
    #	src/vcpkg/commands.ci-verify-versions.cpp
    #	src/vcpkg/registries.cpp
    BillyONeal committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    ac43653 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2023

  1. Substantially overhaul how x-ci-verify-versions works:

    * Print error messages naming the file we're complaining about so that IDEs etc. can go to the file, (Using the standard path: kind: message format)
    * Record the location in try_load_port and friends instead of requiring callers recover that themselves.
    * Make load_git_versions_file return the expected path of the versions file so that callers need not recover that themselves.
    * Delete registry_location from SourceControlFileAndLocation because it is not ever set. (I don't mind this member existing if there's data to go there but right now, there is not).
    * Deduplicate 'try vcpkg.json, also try CONTROL' behavior from x-add-version and x-ci-verify-versions.
    * Don't stop validating versions information at the first error.
    
    The remaining places that are still thinking about adding / "vcpkg.json" are now only:
    
    * format-manifest when deciding the new path after parsing a CONTROL
    * new when deciding the new path
    * inside try_load_port and friends themselves
    * the horrible mess that is how vcpkgpaths loads the consumer-manifest
    BillyONeal committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    21bb633 View commit details
    Browse the repository at this point in the history
  2. Teach vcpkg to find bogus version constraints and overrides that are …

    …meaningless because they aren't in the version database.
    BillyONeal committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    a741b84 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. Configuration menu
    Copy the full SHA
    d9dcaae View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. Configuration menu
    Copy the full SHA
    1e9673c View commit details
    Browse the repository at this point in the history
  2. Fix output claiming that a port isn't in the versions database when i…

    …t is really that the local port is toast or vice versa. Make validating git trees of removed-from-baseline ports possible.
    BillyONeal committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    40bdceb View commit details
    Browse the repository at this point in the history
  3. oops

    BillyONeal committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    7b3682f View commit details
    Browse the repository at this point in the history
  4. oops2

    BillyONeal committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    13a30de View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8dd6ad8 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9ad36ac View commit details
    Browse the repository at this point in the history
  7. Get rid of one more CONTROL/vcpkg.json tester by using git_checkout_p…

    …ort instead of git_show. (This also makes repeatedly running much faster)
    BillyONeal committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    b094ab1 View commit details
    Browse the repository at this point in the history
  8. Print success and failure messages at the same time and deduplicate g…

    …it checkout failure output.
    BillyONeal committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    58452c1 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    dac383c View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. Deduplicate 'failed to load port' message.

    Before:
    ```
    PS C:\Dev\test> ..\vcpkg\vcpkg.exe install
    warning: In the September 2023 release, the default triplet for vcpkg libraries changed from x86-windows to the detected host triplet (x64-windows). For the old behavior, add --triplet x86-windows . To suppress this message, add --triplet x64-windows .
    error: while loading C:\Dev\vcpkg\buildtrees\versioning_\versions\libwebp\a05e0de81085231df86f6902aba1e0a364e2ca7b\CONTROL:
    C:\Dev\vcpkg\buildtrees\versioning_\versions\libwebp\a05e0de81085231df86f6902aba1e0a364e2ca7b\CONTROL:1:94: error: invalid character in feature name (must be lowercase, digits, '-', or '*')
      on expression: libwebp[anim, gif2webp, img2webp, info, mux, nearlossless, simd, cwebp, dwebp], libwebp[vwebp_sdl] (!osx), libwebp[extras] (!osx)
                                                                                                                  ^Failed to load port libwebp from C:\Dev\vcpkg\buildtrees\versioning_\versions\libwebp\a05e0de81085231df86f6902aba1e0a364e2ca7b
    note: updating vcpkg by rerunning bootstrap-vcpkg may resolve this failure.
    ```
    
    After:
    ```
    PS C:\Dev\test> C:\Dev\vcpkg-tool\out\build\Win-x64-Release-Official\vcpkg.exe install --vcpkg-root=C:\Dev\vcpkg
    warning: In the September 2023 release, the default triplet for vcpkg libraries changed from x86-windows to the detected host triplet (x64-windows). For the old behavior, add --triplet x86-windows . To suppress this message, add --triplet x64-windows .
    C:\Dev\vcpkg\buildtrees\versioning_\versions\libwebp\a05e0de81085231df86f6902aba1e0a364e2ca7b\CONTROL:1:94: error: invalid character in feature name (must be lowercase, digits, '-', or '*')
      on expression: libwebp[anim, gif2webp, img2webp, info, mux, nearlossless, simd, cwebp, dwebp], libwebp[vwebp_sdl] (!osx), libwebp[extras] (!osx)
                                                                                                                  ^
    
    note: updating vcpkg by rerunning bootstrap-vcpkg may resolve this failure.
    PS C:\Dev\test>
    ```
    BillyONeal committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    8786bab View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    de7428c View commit details
    Browse the repository at this point in the history
  3. Fix crash while parsing malformed manifest files.

    Alternative to microsoft#1211
    
    Fixes microsoft/vcpkg#33973
    
    I'm not entirely happy with this because it emits extra 'mismatched type' warnings like $.dependencies[0].features[0]: mismatched type: expected a feature in a dependency .
    BillyONeal committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    68122ce View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2023

  1. Configuration menu
    Copy the full SHA
    b04a5b2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    43c98e5 View commit details
    Browse the repository at this point in the history
  3. Code review feedback

    BillyONeal committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    38f738d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    80fa913 View commit details
    Browse the repository at this point in the history
  5. Burninate Expr::Empty

    BillyONeal committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    918269b View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2023

  1. Configuration menu
    Copy the full SHA
    7f9ac40 View commit details
    Browse the repository at this point in the history
  2. Code review feedback

    BillyONeal committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    582382f View commit details
    Browse the repository at this point in the history
  3. Merge branch 'clarify-no-baseline-vs-error' into version-verification

    # Conflicts:
    #	include/vcpkg/paragraphs.h
    #	src/vcpkg-test/manifests.cpp
    #	src/vcpkg/commands.add.cpp
    #	src/vcpkg/commands.format-manifest.cpp
    #	src/vcpkg/commands.install.cpp
    BillyONeal committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    09cbd98 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'add-error-for-bad-dependency-features' into version-ver…

    …ification
    
    # Conflicts:
    #	src/vcpkg-test/registries.cpp
    #	src/vcpkg/commands.install.cpp
    #	src/vcpkg/sourceparagraph.cpp
    BillyONeal committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    580244c View commit details
    Browse the repository at this point in the history
  5. Fix merge conflicts

    BillyONeal committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    b2a6334 View commit details
    Browse the repository at this point in the history
  6. Restore spdx_location.

    BillyONeal committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    ae5300b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e2f38d8 View commit details
    Browse the repository at this point in the history
  8. Tolerate no user.name etc.

    BillyONeal committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    cdcbfb5 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    5c26031 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2023

  1. Merge remote-tracking branch 'origin/main' into version-verification

    # Conflicts:
    #	src/vcpkg-test/manifests.cpp
    #	src/vcpkg-test/registries.cpp
    #	src/vcpkg/commands.install.cpp
    #	src/vcpkg/sourceparagraph.cpp
    BillyONeal committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    fd4e9c4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c77b92b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    89e216e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    78c4aaf View commit details
    Browse the repository at this point in the history
  5. clang-format

    BillyONeal committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    0dd96ee View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2023

  1. Merge remote-tracking branch 'origin/main' into version-verification

    # Conflicts:
    #	include/vcpkg/base/message-data.inc.h
    #	include/vcpkg/paragraphparser.h
    #	include/vcpkg/paragraphs.h
    #	locales/messages.json
    #	src/vcpkg/commands.add-version.cpp
    #	src/vcpkg/commands.autocomplete.cpp
    #	src/vcpkg/commands.ci-verify-versions.cpp
    #	src/vcpkg/commands.format-manifest.cpp
    #	src/vcpkg/paragraphs.cpp
    #	src/vcpkg/portfileprovider.cpp
    #	src/vcpkg/registries.cpp
    BillyONeal committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    ede9734 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    70e914b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    57340d0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    251334b View commit details
    Browse the repository at this point in the history
  5. Fix output nitpicks

    BillyONeal committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    d5e4042 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    95936ec View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    1cfa496 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    f7a9589 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    392a47c View commit details
    Browse the repository at this point in the history
  10. Merge remote-tracking branch 'origin/main' into version-verification

    # Conflicts:
    #	src/vcpkg/commands.add.cpp
    #	src/vcpkg/vcpkgpaths.cpp
    BillyONeal committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    6a7bbd2 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. Merge remote-tracking branch 'origin/main' into version-verification

    # Conflicts:
    #	include/vcpkg/paragraphs.h
    #	src/vcpkg/commands.ci-verify-versions.cpp
    #	src/vcpkg/paragraphs.cpp
    BillyONeal committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    afdbeea View commit details
    Browse the repository at this point in the history
  2. Ensure spdx_location is not dropped when loading ports.

    1. Change try_load_port and friends to accept the spdx location and return SourceControlFileAndLocation rather than requiring all callers to staple that on.
    2. PathAndLocation => PortLocation
    3. Fix confusion in SourceControlFileAndLocation due to some parts of the codebase using source_location as the port_directory.
    4. Rename all "registry_location"s to "spdx_location" to avoid it sounding like this is the spdx location of the registry.
    5. Require origin to be provided in all the places.
    BillyONeal committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    903cb74 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a4b7fa1 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2023

  1. Configuration menu
    Copy the full SHA
    db17508 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2023

  1. Merge remote-tracking branch 'BillyONeal/use-schemed-version' into ve…

    …rsion-verification
    
    # Conflicts:
    #	include/vcpkg/sourceparagraph.h
    #	src/vcpkg-test/dependencies.cpp
    #	src/vcpkg-test/manifests.cpp
    #	src/vcpkg/dependencies.cpp
    #	src/vcpkg/sourceparagraph.cpp
    BillyONeal committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    36b33a2 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. Merge remote-tracking branch 'origin/main' into version-verification

    # Conflicts:
    #	src/vcpkg/commands.ci-verify-versions.cpp
    #	src/vcpkg/registries.cpp
    BillyONeal committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    2291b0a View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. Configuration menu
    Copy the full SHA
    dc0110e View commit details
    Browse the repository at this point in the history
  2. Persist the correct path.

    BillyONeal committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    a18997b View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2023

  1. Configuration menu
    Copy the full SHA
    6e794ec View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2023

  1. Configuration menu
    Copy the full SHA
    a922e76 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. Merge remote-tracking branch 'origin/main' into spdx_location

    # Conflicts:
    #	src/vcpkg/portfileprovider.cpp
    #	src/vcpkg/spdx.cpp
    BillyONeal committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    4434e81 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'spdx_location' into version-verification

    # Conflicts:
    #	include/vcpkg/base/expected.h
    #	include/vcpkg/base/message-args.inc.h
    #	include/vcpkg/base/message-data.inc.h
    #	include/vcpkg/paragraphs.h
    #	include/vcpkg/sourceparagraph.h
    #	locales/messages.json
    #	src/vcpkg-test/manifests.cpp
    #	src/vcpkg/commands.add-version.cpp
    #	src/vcpkg/commands.autocomplete.cpp
    #	src/vcpkg/commands.build.cpp
    #	src/vcpkg/commands.ci-verify-versions.cpp
    #	src/vcpkg/dependencies.cpp
    #	src/vcpkg/paragraphs.cpp
    #	src/vcpkg/portfileprovider.cpp
    #	src/vcpkg/registries.cpp
    #	src/vcpkg/sourceparagraph.cpp
    #	src/vcpkg/spdx.cpp
    #	src/vcpkg/vcpkgpaths.cpp
    BillyONeal committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    b70ddbe View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    570d2f3 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. Merge remote-tracking branch 'origin/main' into version-verification

    # Conflicts:
    #	include/vcpkg/paragraphs.h
    #	include/vcpkg/sourceparagraph.h
    #	src/vcpkg/commands.add-version.cpp
    #	src/vcpkg/commands.autocomplete.cpp
    #	src/vcpkg/commands.build.cpp
    #	src/vcpkg/commands.ci-verify-versions.cpp
    #	src/vcpkg/commands.format-manifest.cpp
    #	src/vcpkg/dependencies.cpp
    #	src/vcpkg/paragraphs.cpp
    #	src/vcpkg/portfileprovider.cpp
    #	src/vcpkg/registries.cpp
    #	src/vcpkg/sourceparagraph.cpp
    BillyONeal committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    b195ca2 View commit details
    Browse the repository at this point in the history
  2. Merge gore

    BillyONeal committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    696c90d View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Configuration menu
    Copy the full SHA
    f38ed65 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. Merge remote-tracking branch 'origin/main' into version-verification

    # Conflicts:
    #	include/vcpkg/base/jsonreader.h
    #	include/vcpkg/base/message-data.inc.h
    #	locales/messages.json
    #	src/vcpkg-test/configmetadata.cpp
    #	src/vcpkg-test/registries.cpp
    #	src/vcpkg/base/json.cpp
    #	src/vcpkg/commands.ci-verify-versions.cpp
    #	src/vcpkg/commands.format-manifest.cpp
    #	src/vcpkg/configuration.cpp
    #	src/vcpkg/paragraphs.cpp
    #	src/vcpkg/portfileprovider.cpp
    #	src/vcpkg/registries.cpp
    #	src/vcpkg/sourceparagraph.cpp
    #	src/vcpkg/vcpkgpaths.cpp
    BillyONeal committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    d3d53c9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fa86593 View commit details
    Browse the repository at this point in the history
  3. Remove unused messages.

    BillyONeal committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    3d2f9b0 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Merge remote-tracking branch 'origin/main' into version-verification

    # Conflicts:
    #	include/vcpkg/base/message-data.inc.h
    #	locales/messages.json
    BillyONeal committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    c2e82e5 View commit details
    Browse the repository at this point in the history