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

[ned14-internal-quickcpplib/llfio/outcome] Update to latest release #20171

Merged
merged 7 commits into from
Sep 27, 2021

Conversation

ned14
Copy link
Contributor

@ned14 ned14 commented Sep 15, 2021

Describe the pull request

  • What does your PR fix?

Update ned14-internal-quickcpplib and LLFIO to latest matching Outcome v2.2.1 (bugfixed) release.

  • Which triplets are supported/not supported? Have you updated the [CI baseline]

All the same as before.

Yes.

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

Yes

@ned14
Copy link
Contributor Author

ned14 commented Sep 15, 2021

Looks like "Test Modified Ports and Prepare Test Logs" is failing for the Windows targets. Obviously this is new since I last submitted a version bump.

Do I need to add something about test status to some file in the commit or something?

@BillyONeal
Copy link
Member

Looks like "Test Modified Ports and Prepare Test Logs" is failing for the Windows targets. Obviously this is new since I last submitted a version bump.

We added an overzealous check, I removed the check and pushed a merge with master for you.

@BillyONeal
Copy link
Member

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@PhoebeHui PhoebeHui self-assigned this Sep 16, 2021
@PhoebeHui PhoebeHui changed the title Update ned14-internal-quickcpplib and LLFIO to latest matching Outcome v2.2.1 (bugfixed) release. [ned14-internal-quickcpplib/llfio/outcome] Update to latest release Sep 16, 2021
@PhoebeHui PhoebeHui added the category:port-update The issue is with a library, which is requesting update new revision label Sep 16, 2021
Copy link
Contributor

@PhoebeHui PhoebeHui left a comment

Choose a reason for hiding this comment

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

@ned14, thanks for the PR! Could you address the review suggestions?

ports/ned14-internal-quickcpplib/vcpkg.json Outdated Show resolved Hide resolved
ports/outcome/vcpkg.json Outdated Show resolved Hide resolved
ports/llfio/vcpkg.json Outdated Show resolved Hide resolved
ports/llfio/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.

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)

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/llfio/portfile.cmake
  • ports/ned14-internal-quickcpplib/portfile.cmake
  • ports/outcome/portfile.cmake

@PhoebeHui PhoebeHui added the info:reviewed Pull Request changes follow basic guidelines label Sep 22, 2021
@ned14
Copy link
Contributor Author

ned14 commented Sep 22, 2021

Can you not merge this as is please? One of the reasons I'm late getting back to this PR is because a showstopper memory corruption bug was present in this edition of LLFIO. Everything needs bumped to latest versions. I'll try to find time to do it soon.

@ned14
Copy link
Contributor Author

ned14 commented Sep 22, 2021

Ok moved to latest everything, fixed suggested items from review.

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 47d2378c8181ece05ffc51acd2ed60d97e3c9a64 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 738e6b8..316d959 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4490,7 +4490,7 @@
     },
     "ned14-internal-quickcpplib": {
       "baseline": "0.0.0-e691a6dc",
-      "port-version": 1
+      "port-version": 0
     },
     "neon2sse": {
       "baseline": "2021-09-16",
diff --git a/versions/l-/llfio.json b/versions/l-/llfio.json
index b21094a..fa6953f 100644
--- a/versions/l-/llfio.json
+++ b/versions/l-/llfio.json
@@ -14,6 +14,11 @@
       "git-tree": "ffb9aa3f751b213fd6bde4d06f1c694c489e08f0",
       "version-string": "2.0-20210420",
       "port-version": 0
+    },
+    {
+      "git-tree": "debab55b24a36f3615bd29f0fe3088032bd61e53",
+      "version-string": "2.0-a74411ed",
+      "port-version": 0
     }
   ]
 }
diff --git a/versions/n-/ned14-internal-quickcpplib.json b/versions/n-/ned14-internal-quickcpplib.json
index 08f8e23..2c4ad5c 100644
--- a/versions/n-/ned14-internal-quickcpplib.json
+++ b/versions/n-/ned14-internal-quickcpplib.json
@@ -1,9 +1,9 @@
 {
   "versions": [
     {
-      "git-tree": "4ab01a05efd3fbf320d64a4914983606adb55fb5",
+      "git-tree": "801be68901e5e7e84e4069015346fc457e72953c",
       "version-string": "0.0.0-e691a6dc",
-      "port-version": 1
+      "port-version": 0
     },
     {
       "git-tree": "3cd8528057f78bdbc43616bbe7349acd5cc41c77",
diff --git a/versions/o-/outcome.json b/versions/o-/outcome.json
index c3b5a02..6c50899 100644
--- a/versions/o-/outcome.json
+++ b/versions/o-/outcome.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "250b9fe23bacf477fcd64d8834db701986ae1a6c",
+      "git-tree": "31aada521fafc8169a891338a3af04fa4f658327",
       "version-string": "2.2.2-20210922",
       "port-version": 0
     },

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)

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/llfio/portfile.cmake
  • ports/ned14-internal-quickcpplib/portfile.cmake
  • ports/outcome/portfile.cmake

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 9d892ff9270f2d2fe3b8e490471f0a7dfa78981e -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/l-/llfio.json b/versions/l-/llfio.json
index b21094a..fa6953f 100644
--- a/versions/l-/llfio.json
+++ b/versions/l-/llfio.json
@@ -14,6 +14,11 @@
       "git-tree": "ffb9aa3f751b213fd6bde4d06f1c694c489e08f0",
       "version-string": "2.0-20210420",
       "port-version": 0
+    },
+    {
+      "git-tree": "debab55b24a36f3615bd29f0fe3088032bd61e53",
+      "version-string": "2.0-a74411ed",
+      "port-version": 0
     }
   ]
 }
diff --git a/versions/n-/ned14-internal-quickcpplib.json b/versions/n-/ned14-internal-quickcpplib.json
index b706b9e..2c4ad5c 100644
--- a/versions/n-/ned14-internal-quickcpplib.json
+++ b/versions/n-/ned14-internal-quickcpplib.json
@@ -5,11 +5,6 @@
       "version-string": "0.0.0-e691a6dc",
       "port-version": 0
     },
-    {
-      "git-tree": "4ab01a05efd3fbf320d64a4914983606adb55fb5",
-      "version-string": "0.0.0-e691a6dc",
-      "port-version": 1
-    },
     {
       "git-tree": "3cd8528057f78bdbc43616bbe7349acd5cc41c77",
       "version-string": "0.0.0-7cb75d4e",

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)

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/llfio/portfile.cmake
  • ports/ned14-internal-quickcpplib/portfile.cmake
  • ports/outcome/portfile.cmake

@BillyONeal BillyONeal removed the info:reviewed Pull Request changes follow basic guidelines label Sep 24, 2021
@BillyONeal
Copy link
Member

Can you not merge this as is please? One of the reasons I'm late getting back to this PR is because a showstopper memory corruption bug was present in this edition of LLFIO. Everything needs bumped to latest versions. I'll try to find time to do it soon.

You can also just close the PR whenever that happens and reopen later :)

Copy link
Contributor

@PhoebeHui PhoebeHui left a comment

Choose a reason for hiding this comment

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

Thanks for the updates

@PhoebeHui PhoebeHui added the info:reviewed Pull Request changes follow basic guidelines label Sep 24, 2021
@ned14
Copy link
Contributor Author

ned14 commented Sep 24, 2021

You can also just close the PR whenever that happens and reopen later :)

It's kinda hard to know what the expected process semantics are for PRs across different orgs. Some get real arsey if you close and open PRs. Or open PRs at all without a preceding issue. Even here in vcpkg I've noticed quite a lot of change in the past year in terms of vibe and process. Probably your influence Billy :)

Re: this one change requested above, I don't understand it. Didn't I already update the versions last commit I did? If I did it wrong, I'll need instruction on how to do it better, I merged latest master, readded versions, commit. I don't know what else I am supposed to do.

@BillyONeal
Copy link
Member

It's kinda hard to know what the expected process semantics are for PRs across different orgs. Some get real arsey if you close and open PRs. Or open PRs at all without a preceding issue. Even here in vcpkg I've noticed quite a lot of change in the past year in terms of vibe and process. Probably your influence Billy :)

I hope you're getting a good experience contributing :)

Re: this one change requested above, I don't understand it. Didn't I already update the versions last commit I did? If I did it wrong, I'll need instruction on how to do it better, I merged latest master, readded versions, commit. I don't know what else I am supposed to do.

The version database should have only 1 new version entry added per port per PR; this change removes an entry:

image

and adds multiple entries:

image

A good way to fix this is to (1) merge with origin/master, (2) git checkout origin/master -- versions, then rerun any commands to touch the version database. I'm just going to fix this one for you though....

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.

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)

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/llfio/portfile.cmake
  • ports/ned14-internal-quickcpplib/portfile.cmake
  • ports/outcome/portfile.cmake

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.

Will land as soon as build comes back.

@ned14
Copy link
Contributor Author

ned14 commented Sep 27, 2021

The version database should have only 1 new version entry added per port per PR; this change removes an entry:

That was intentional.

and adds multiple entries:

That was not. I wanted only the one with port-version: 0, but obviously vcpkg readded in the other one.

@BillyONeal
Copy link
Member

The version database should have only 1 new version entry added per port per PR; this change removes an entry:

That was intentional.

Version entries can never be removed.

and adds multiple entries:

That was not. I wanted only the one with port-version: 0, but obviously vcpkg readded in the other one.

Your vcpkg.json has port-version: 1 so it kept trying to add that one.

@BillyONeal BillyONeal merged commit 46700e2 into microsoft:master Sep 27, 2021
@BillyONeal
Copy link
Member

Thanks for the version updates!

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.

None yet

4 participants