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

[abseil] Upgrade to 20210324.2 #19357

Merged
merged 18 commits into from
Aug 19, 2021
Merged

[abseil] Upgrade to 20210324.2 #19357

merged 18 commits into from
Aug 19, 2021

Conversation

srgbtl
Copy link
Contributor

@srgbtl srgbtl commented Aug 4, 2021

No description provided.

@ghost
Copy link

ghost commented Aug 4, 2021

CLA assistant check
All CLA requirements met.

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!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout bd5ea16b97e91cb620fed0e10b7d9b3a8a943a52 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json
index 1048c20..3118536 100644
--- a/versions/a-/abseil.json
+++ b/versions/a-/abseil.json
@@ -2,7 +2,7 @@
   "versions": [
     {
       "git-tree": "7afb928a59ae165fb87f21a8b3345fb93547a09c",
-      "version-string": "2021-03-24",
+      "version-date": "2021-03-24",
       "port-version": 2
     },
     {

@JonLiu1993 JonLiu1993 self-assigned this Aug 4, 2021
@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Aug 4, 2021
ports/abseil/vcpkg.json Outdated Show resolved Hide resolved
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!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout bd5ea16b97e91cb620fed0e10b7d9b3a8a943a52 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json
index 32b771e..3118536 100644
--- a/versions/a-/abseil.json
+++ b/versions/a-/abseil.json
@@ -2,7 +2,7 @@
   "versions": [
     {
       "git-tree": "7afb928a59ae165fb87f21a8b3345fb93547a09c",
-      "version-date": "2021-03-24.2",
+      "version-date": "2021-03-24",
       "port-version": 2
     },
     {

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: Local changes detected for abseil but no changes to version or port version.
-- Version: 2021-03-24
-- Old SHA: d58deb5198f8a1d72eafc3e1d6bdb36197fac470
-- New SHA: 06129ba692a74865ec8f0189cd61038fcbd8d629
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout bd5ea16b97e91cb620fed0e10b7d9b3a8a943a52 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json
index 3118536..20e992d 100644
--- a/versions/a-/abseil.json
+++ b/versions/a-/abseil.json
@@ -1,10 +1,5 @@
 {
   "versions": [
-    {
-      "git-tree": "7afb928a59ae165fb87f21a8b3345fb93547a09c",
-      "version-date": "2021-03-24",
-      "port-version": 2
-    },
     {
       "git-tree": "bae9c59114a4a2dc396452fb9e988a9da881b4f4",
       "version-date": "2021-03-24",
diff --git a/versions/baseline.json b/versions/baseline.json
index c6cd9c6..5dd702d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -10,7 +10,7 @@
     },
     "abseil": {
       "baseline": "2021-03-24",
-      "port-version": 2
+      "port-version": 0
     },
     "absent": {
       "baseline": "0.3.1",

@srgbtl srgbtl requested a review from JonLiu1993 August 4, 2021 09:57
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/abseil/vcpkg.json b/ports/abseil/vcpkg.json
index 620deb5..f8b9059 100644
--- a/ports/abseil/vcpkg.json
+++ b/ports/abseil/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "abseil",
   "version-date": "2021-03-24.2",
-  "port-version": 0,
   "description": [
     "an open-source collection designed to augment the C++ standard library.",
     "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.",
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout bd5ea16b97e91cb620fed0e10b7d9b3a8a943a52 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json
index 3286d61..125e46b 100644
--- a/versions/a-/abseil.json
+++ b/versions/a-/abseil.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "7afb928a59ae165fb87f21a8b3345fb93547a09c",
+      "git-tree": "628a8266bc65edd927ceea767b340361eae4ff96",
       "version-date": "2021-03-24.2",
       "port-version": 0
     },

Copy link
Member

@JonLiu1993 JonLiu1993 left a comment

Choose a reason for hiding this comment

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

Please run command "./vcpkg x-add-version abseil --overwrite-version" then commit the changes again

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/abseil/vcpkg.json b/ports/abseil/vcpkg.json
index 620deb5..f8b9059 100644
--- a/ports/abseil/vcpkg.json
+++ b/ports/abseil/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "abseil",
   "version-date": "2021-03-24.2",
-  "port-version": 0,
   "description": [
     "an open-source collection designed to augment the C++ standard library.",
     "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.",

@JonLiu1993
Copy link
Member

JonLiu1993 commented Aug 4, 2021

After completing the modification, please run the command "./vcpkg x-add-version abseil --overwrite-version" and submit the changes again

@srgbtl srgbtl requested a review from JonLiu1993 August 4, 2021 10:25
@@ -1,7 +1,6 @@
{
"name": "abseil",
"version-date": "2021-03-24",
"port-version": 1,
"version-date": "2021-03-24.2",
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"version-date": "2021-03-24.2",
"version-date": "2021-03-24",

@srgbtl srgbtl requested a review from JonLiu1993 August 4, 2021 10:37
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: Local changes detected for abseil but no changes to version or port version.
-- Version: 2021-03-24
-- Old SHA: d58deb5198f8a1d72eafc3e1d6bdb36197fac470
-- New SHA: 06129ba692a74865ec8f0189cd61038fcbd8d629
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout bd5ea16b97e91cb620fed0e10b7d9b3a8a943a52 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json
index 0ab6652..20e992d 100644
--- a/versions/a-/abseil.json
+++ b/versions/a-/abseil.json
@@ -1,10 +1,5 @@
 {
   "versions": [
-    {
-      "git-tree": "628a8266bc65edd927ceea767b340361eae4ff96",
-      "version-date": "2021-03-24",
-      "port-version": 0
-    },
     {
       "git-tree": "bae9c59114a4a2dc396452fb9e988a9da881b4f4",
       "version-date": "2021-03-24",

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: Local changes detected for abseil but no changes to version or port version.
-- Version: 2021-03-24
-- Old SHA: d58deb5198f8a1d72eafc3e1d6bdb36197fac470
-- New SHA: 06129ba692a74865ec8f0189cd61038fcbd8d629
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

@JonLiu1993
Copy link
Member

@srgbtl ,Where is the versions/a-/abseil.json file?

@srgbtl
Copy link
Contributor Author

srgbtl commented Aug 4, 2021

@srgbtl ,Where is the versions/a-/abseil.json file?

@JonLiu1993

See: #19357 (review)
Bot requested to remove changes there.

Based on previous PR #16664 where a newer patch was applied, it should be done as in dcde413

ports/abseil/vcpkg.json Outdated Show resolved Hide resolved
versions/a-/abseil.json Show resolved Hide resolved
@srgbtl srgbtl requested a review from JonLiu1993 August 5, 2021 09:47
ports/abseil/vcpkg.json Outdated Show resolved Hide resolved
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: Local changes detected for abseil but no changes to version or port version.
-- Version: 2021-03-24
-- Old SHA: d58deb5198f8a1d72eafc3e1d6bdb36197fac470
-- New SHA: 06129ba692a74865ec8f0189cd61038fcbd8d629
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout bd5ea16b97e91cb620fed0e10b7d9b3a8a943a52 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json
index 3118536..20e992d 100644
--- a/versions/a-/abseil.json
+++ b/versions/a-/abseil.json
@@ -1,10 +1,5 @@
 {
   "versions": [
-    {
-      "git-tree": "7afb928a59ae165fb87f21a8b3345fb93547a09c",
-      "version-date": "2021-03-24",
-      "port-version": 2
-    },
     {
       "git-tree": "bae9c59114a4a2dc396452fb9e988a9da881b4f4",
       "version-date": "2021-03-24",
diff --git a/versions/baseline.json b/versions/baseline.json
index 8d3554d..061c6e2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -10,7 +10,7 @@
     },
     "abseil": {
       "baseline": "2021-03-24",
-      "port-version": 2
+      "port-version": 0
     },
     "absent": {
       "baseline": "0.3.1",

@srgbtl
Copy link
Contributor Author

srgbtl commented Aug 6, 2021

@JonLiu1993 removed. What should be done next? How to deal with errors reported in checks?

@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Aug 9, 2021
ports/abseil/vcpkg.json Outdated Show resolved Hide resolved
@srgbtl srgbtl requested a review from PhoebeHui August 11, 2021 17:46
@dan-shaw dan-shaw merged commit 27d8b29 into microsoft:master Aug 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants