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

[cpr] update to 1.10.2 #30747

Merged
merged 6 commits into from
Apr 21, 2023
Merged

[cpr] update to 1.10.2 #30747

merged 6 commits into from
Apr 21, 2023

Conversation

Adela0814
Copy link
Contributor

Fixes #30725
Tested all feature in the following triplets:

  • x64-windows
  • x64-windows-static
  • x86-windows
  • Changes comply with the maintainer guide
  • SHA512s are updated for each updated download
  • The "supports" clause reflects platforms that may be fixed by this new version
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

@Adela0814 Adela0814 added info:internal This PR or Issue was filed by the vcpkg team. category:port-update The issue is with a library, which is requesting update new revision labels Apr 10, 2023
@Adela0814 Adela0814 added the category:port-bug The issue is with a library, which is something the port should already support label Apr 19, 2023
REF a2d35a1cb9f3f7e2f1469d6a189751331dc99f96 #v1.9.3
SHA512 5df799fa53d51ba020a860ff928123921ed0ba59152de2b7e9d88b54ace820f5881fc72d056fca5679a7710357aa25854fa6dd6f9d230338b5378aebfe2bd957
REF 0445800cd2cace404ac37eb3e78ec5d1431a4f30 #1.10.2
SHA512 77723343b2ce89a10b8622cf54127edd6639412e3d457caed31b4fa1d3935d79846b4be695c327001fc2228313591e320c9080dbf8c09e3b69265f81641b9973
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Include upstream fixes: libcpr/cpr@1e83539 and libcpr/cpr@025984a.

@Adela0814 Adela0814 marked this pull request as ready for review April 19, 2023 09:50
JonLiu1993
JonLiu1993 previously approved these changes Apr 20, 2023
@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Apr 20, 2023
@@ -1,6 +1,6 @@
{
"name": "cpr",
"version-semver": "1.9.3",
"version-semver": "1.10.2",
Copy link
Contributor

Choose a reason for hiding this comment

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

Actually it is not exactly 1.10.2 but 1.10.2+3.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What does 1.10.2+3 mean? Do you mean the version should be version+commitid?

Copy link
Contributor

Choose a reason for hiding this comment

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

In this way, it would indicate:

  • It is not 1.10.2. (true!)
  • It is newer than 1.10.2 but older than 1.10.3 (indicated by +).
  • It is three commits more (indicated by 3).

Commit IDs cannot be compared for "newer". We need dates (20230418) or number of commits (3) or numbered identifers (patch3).

I don't know if the + syntax is supported by the version-semver scheme, but it is by the version scheme.

Copy link
Member

Choose a reason for hiding this comment

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

  • in semver world means "build metadata" and is not semantically relevant. I'm going to include it here because the build is green and the change is otherwise good but I don't think this establishes convention.

Copy link
Contributor

Choose a reason for hiding this comment

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

In repology world 1.10.2 means 1.10.2, and using anything but the corresponding tarball means "lying about the version".

@JonLiu1993 JonLiu1993 removed the info:reviewed Pull Request changes follow basic guidelines label Apr 20, 2023
@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Apr 21, 2023
@BillyONeal BillyONeal merged commit 195fb66 into microsoft:master Apr 21, 2023
12 checks passed
@BillyONeal
Copy link
Member

Thanks for the update!

This was referenced May 11, 2023
@Adela0814 Adela0814 deleted the Dev/Mengna/cpr branch July 18, 2023 07:08
@GlassBil
Copy link

GlassBil commented Sep 21, 2023

cpr 1.10.x has cpp17 as min c++ standard. Any way to use 1.9.x (which is still maintained until 2025) for systems that don't support cpp17? Rather not lock builtin-baseline to a commit before this update.

@dg0yt
Copy link
Contributor

dg0yt commented Sep 21, 2023

cpr 1.10.x has cpp17 as min c++ standard. Any way to use 1.9.x (which is still maintained until 2025) for systems that don't support cpp17? Rather not lock builtin-baseline to a commit before this update.

In manifest mode, you don't need to lock the baseline. You can use overrides to pin specific port versions:
https://learn.microsoft.com/en-us/vcpkg/users/versioning#overrides

@GlassBil
Copy link

In manifest mode, you don't need to lock the baseline. You can use overrides to pin specific port versions: https://learn.microsoft.com/en-us/vcpkg/users/versioning#overrides

Unfortunately, you can't use overrides without builtin-baseline:

error: vcpkg.json was rejected because it uses "overrides" and does not have a "builtin-baseline". This can be fixed by removing the uses of "overrides" or adding a "builtin-baseline".

@dg0yt
Copy link
Contributor

dg0yt commented Sep 22, 2023

What I meant was that you can set the baseline to a recent commit. You don't need to lock everything to the old state.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support category:port-update The issue is with a library, which is requesting update new revision info:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cpr update to 1.10.2
5 participants