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

[etcd-cpp-apiv3] Add etcd-cpp-apiv3 ports. #29363

Merged
merged 9 commits into from
Feb 8, 2023

Conversation

sighingnow
Copy link
Contributor

@sighingnow sighingnow commented Feb 1, 2023

  • Changes comply with the maintainer guide
  • The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines.
  • Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all find_package calls are REQUIRED, are satisfied by vcpkg.json's declared dependencies, or disabled with CMAKE_DISABLE_FIND_PACKAGE_Xxx
  • The versioning scheme in vcpkg.json matches what upstream says.
  • The license declaration in vcpkg.json matches what upstream says.
  • The installed as the "copyright" file matches what upstream says.
  • The source code of the component installed comes from an authoritative source.
  • The generated "usage text" is accurate. See docs/examples/adding-an-explicit-usage.md for context.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is in the new port's versions file.
  • Only one version is added to each modified port's versions file.

Signed-off-by: Tao He <sighingnow@gmail.com>
@sighingnow sighingnow changed the title Add etcd-cpp-vpiv3 ports. Add etcd-cpp-apiv3 ports. Feb 1, 2023
Signed-off-by: Tao He <sighingnow@gmail.com>
@MonicaLiu0311 MonicaLiu0311 changed the title Add etcd-cpp-apiv3 ports. [etcd-cpp-apiv3] Add etcd-cpp-apiv3 ports. Feb 2, 2023
@MonicaLiu0311 MonicaLiu0311 added the category:new-port The issue is requesting a new library to be added; consider making a PR! label Feb 2, 2023
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.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for etcd-cpp-apiv3 have changed but the version was not updated
version: 0.2.12
old SHA: 1c700da2d3e7ad82e97bca5ecc5b24129519b18d
new SHA: 8ac6dd66dbc8eb4349b1df236e96898e7de654d7
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
vcpkg_extract_source_archive_ex -> vcpkg_extract_source_archive
vcpkg_build_msbuild -> vcpkg_install_msbuild
vcpkg_copy_tool_dependencies -> vcpkg_copy_tools
vcpkg_apply_patches should be replaced by the PATCHES arguments to the "extract" helpers (e.g. vcpkg_from_github())

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/etcd-cpp-apiv3/portfile.cmake

You have modified or added at least one vcpkg.json where you should check the license field.

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

  • ports/etcd-cpp-apiv3/vcpkg.json

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

Signed-off-by: Tao He <sighingnow@gmail.com>
@sighingnow
Copy link
Contributor Author

Hi @MonicaLiu0311,

Could you please help to take a look at the CI errors? The "Create Diff" failed should be caused by this pull request.

All comments above has been addressed.

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.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff
diff --git a/ports/etcd-cpp-apiv3/vcpkg.json b/ports/etcd-cpp-apiv3/vcpkg.json
index 359d9f8..3ad3971 100644
--- a/ports/etcd-cpp-apiv3/vcpkg.json
+++ b/ports/etcd-cpp-apiv3/vcpkg.json
@@ -5,14 +5,6 @@
   "homepage": "https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3",
   "license": "BSD-3-Clause",
   "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    },
     "boost-asio",
     "boost-random",
     "boost-system",
@@ -20,6 +12,14 @@
     "cpprestsdk",
     "grpc",
     "openssl",
-    "protobuf"
+    "protobuf",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for etcd-cpp-apiv3 have changed but the version was not updated
version: 0.2.12
old SHA: 8ac6dd66dbc8eb4349b1df236e96898e7de654d7
new SHA: d11dfdbdc719392013a05c613a68271b167b7ec2
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

Signed-off-by: Tao He <sighingnow@gmail.com>
@MonicaLiu0311
Copy link
Contributor

MonicaLiu0311 commented Feb 3, 2023

##[error]Found the following errors:
    Error: While reading versions for port etcd-cpp-apiv3 from file: C:\a\1\s\versions\e-\etcd-cpp-apiv3.json
       File declares version `0.2.12` with SHA: 8ac6dd66dbc8eb4349b1df236e96898e7de654d7
       But local port with the same version has a different SHA: 4e1d07e1e6925a03ada21862eb2483fcac5b91b6
       Please update the port's version fields and then run:

           vcpkg x-add-version etcd-cpp-apiv3
           git add versions
           git commit -m "Update version database"

       to add a new version.
To attempt to resolve all errors at once, run:
vcpkg x-add-version --all
##[error]PowerShell exited with code '1'.

The error log is as above, please run the following command and push.

./vcpkg format-manifest ports/etcd-cpp-apiv3/vcpkg.json
./vcpkg x-add-version etcd-cpp-apiv3 --overwrite-version
commit and push

Explanation of --overwrite-version:

After the first modification, please run ./vcpkg x-add-version portName to generate the corresponding json; for subsequent modifications of the same version, please use ./vcpkg x-add-version portName --overwrite-version to update git-tree.

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.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for etcd-cpp-apiv3 have changed but the version was not updated
version: 0.2.12
old SHA: 8ac6dd66dbc8eb4349b1df236e96898e7de654d7
new SHA: d11dfdbdc719392013a05c613a68271b167b7ec2
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

Signed-off-by: Tao He <sighingnow@gmail.com>
@sighingnow
Copy link
Contributor Author

sighingnow commented Feb 4, 2023

CI passed. Can @MonicaLiu0311 or @LilyWangLL help to get this port merged?

Thanks!

@sighingnow
Copy link
Contributor Author

Polite ping @MonicaLiu0311 @LilyWangLL

github-actions[bot]
github-actions bot previously approved these changes Feb 6, 2023
@MonicaLiu0311
Copy link
Contributor

  • The generated "usage text" is accurate.
etcd-cpp-apiv3 provides CMake targets:

    # this is heuristically generated, and may not be correct
    find_package(etcd-cpp-api CONFIG REQUIRED)
    target_link_libraries(main PRIVATE etcd-cpp-api etcd-cpp-api-core)

MonicaLiu0311
MonicaLiu0311 previously approved these changes Feb 6, 2023
@MonicaLiu0311 MonicaLiu0311 added the info:reviewed Pull Request changes follow basic guidelines label Feb 6, 2023
Signed-off-by: Tao He <sighingnow@gmail.com>
@sighingnow
Copy link
Contributor Author

  • The generated "usage text" is accurate.
etcd-cpp-apiv3 provides CMake targets:

    # this is heuristically generated, and may not be correct
    find_package(etcd-cpp-api CONFIG REQUIRED)
    target_link_libraries(main PRIVATE etcd-cpp-api etcd-cpp-api-core)

Usage text updated. Sorry for missing that.

@JavierMatosD
Copy link
Contributor

@sighingnow please follow instructions #29363 (comment) to fix the versioning issue.

@JavierMatosD JavierMatosD added requires:author-response and removed info:reviewed Pull Request changes follow basic guidelines labels Feb 6, 2023
Signed-off-by: Tao He <sighingnow@gmail.com>
@sighingnow
Copy link
Contributor Author

@sighingnow please follow instructions #29363 (comment) to fix the versioning issue.

Fixed.

github-actions[bot]
github-actions bot previously approved these changes Feb 7, 2023
@MonicaLiu0311 MonicaLiu0311 added info:reviewed Pull Request changes follow basic guidelines and removed info:reviewed Pull Request changes follow basic guidelines labels Feb 7, 2023
ports/etcd-cpp-apiv3/portfile.cmake Outdated Show resolved Hide resolved
Signed-off-by: Tao He <sighingnow@gmail.com>
Signed-off-by: Tao He <sighingnow@gmail.com>
@sighingnow
Copy link
Contributor Author

Hi @MonicaLiu0311,

Comment addressed. Can we get this pr accepted now?

Thanks!

@MonicaLiu0311 MonicaLiu0311 added the info:reviewed Pull Request changes follow basic guidelines label Feb 7, 2023
@JavierMatosD JavierMatosD merged commit 4f7e4b0 into microsoft:master Feb 8, 2023
@sighingnow sighingnow deleted the ht/etcd-cpp-apiv3 branch February 8, 2023 04:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:new-port The issue is requesting a new library to be added; consider making a PR! info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants