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

[immer] update port #19521

Merged
merged 10 commits into from
Aug 19, 2021
Merged

[immer] update port #19521

merged 10 commits into from
Aug 19, 2021

Conversation

waybeforenow
Copy link
Contributor

@waybeforenow waybeforenow commented Aug 12, 2021

Describe the pull request

  • What does your PR fix?

    Immer port was previously out of date.

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

    I have tested x86-linux, and there appears to be no incompatible triplets.

  • Does your PR follow the maintainer guide?

    Yes

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

    Yes

If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/

@ghost
Copy link

ghost commented Aug 12, 2021

CLA assistant check
All CLA requirements met.

@JonLiu1993 JonLiu1993 self-assigned this Aug 12, 2021
@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Aug 12, 2021
ports/immer/portfile.cmake Outdated Show resolved Hide resolved
@waybeforenow
Copy link
Contributor Author

The CI shows a regression, but it seems to be related to my vcpkg-cmake-config dependency and not the package itself... (not sure though)

https://dev.azure.com/vcpkg/public/_build/results?buildId=57640&view=logs&j=0a61404f-5c45-5632-e83c-408b7fcca1d6&t=59cc5a87-398a-597b-cb3d-5842723775f1

Installing package vcpkg-cmake-config[core]:x86-windows...
The following files are already installed in D:/installed/x86-windows and are in conflict with vcpkg-cmake-config:x86-windows

Installed by vcpkg-cmake-config:x86-windows
    share/vcpkg-cmake-config/copyright
    share/vcpkg-cmake-config/vcpkg-port-config.cmake
    share/vcpkg-cmake-config/vcpkg_abi_info.txt
    share/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake

[...]

Triplet: x86-windows
Total elapsed time: 4.159 s
RESULTS
    vcpkg-cmake-config:x86-windows: FILE_CONFLICTS: 74.83 ms
    immer:x86-windows: SUCCEEDED: 3.986 s

@JonLiu1993
Copy link
Member

The CI shows a regression, but it seems to be related to my vcpkg-cmake-config dependency and not the package itself... (not sure though)

https://dev.azure.com/vcpkg/public/_build/results?buildId=57640&view=logs&j=0a61404f-5c45-5632-e83c-408b7fcca1d6&t=59cc5a87-398a-597b-cb3d-5842723775f1

Installing package vcpkg-cmake-config[core]:x86-windows...
The following files are already installed in D:/installed/x86-windows and are in conflict with vcpkg-cmake-config:x86-windows

Installed by vcpkg-cmake-config:x86-windows
    share/vcpkg-cmake-config/copyright
    share/vcpkg-cmake-config/vcpkg-port-config.cmake
    share/vcpkg-cmake-config/vcpkg_abi_info.txt
    share/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake

[...]

Triplet: x86-windows
Total elapsed time: 4.159 s
RESULTS
    vcpkg-cmake-config:x86-windows: FILE_CONFLICTS: 74.83 ms
    immer:x86-windows: SUCCEEDED: 3.986 s

vcpkg_cmake_configure and vcpkg_cmake_install provided by vcpkg-cmake port.
vcpkg_cmake_config_fixup provide by vcpkg_cmake_config

ports/immer/vcpkg.json Outdated Show resolved Hide resolved
ports/immer/vcpkg.json Outdated Show resolved Hide resolved
ports/immer/vcpkg.json Outdated Show resolved Hide resolved
ports/immer/portfile.cmake Outdated Show resolved Hide resolved
ports/immer/portfile.cmake Outdated Show resolved Hide resolved
ports/immer/portfile.cmake Outdated Show resolved Hide resolved
waybeforenow and others added 6 commits August 13, 2021 15:02
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
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 63aa65e65b9d2c08772ea15d25fb8fdb0d32e557 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index b0f7b57..9ba7997 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2694,7 +2694,7 @@
     },
     "immer": {
       "baseline": "2021-05-03",
-      "port-version": 2
+      "port-version": 0
     },
     "implot": {
       "baseline": "0.11",
diff --git a/versions/i-/immer.json b/versions/i-/immer.json
index 68850cd..0ab115f 100644
--- a/versions/i-/immer.json
+++ b/versions/i-/immer.json
@@ -1,9 +1,9 @@
 {
   "versions": [
     {
-      "git-tree": "109831691a62c81c985e8652aa7e1f073d776660",
-      "version-string": "2021-05-03",
-      "port-version": 2
+      "git-tree": "0ee78459721140ead0ace0a031bbb9d28039b19e",
+      "version-date": "2021-05-03",
+      "port-version": 0
     },
     {
       "git-tree": "515103042c70e0f9cf8d1518816d09fc6110a669",

@JonLiu1993
Copy link
Member

Thanks for your pr,please run command "./vcpkg x-add-version immer --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!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 63aa65e65b9d2c08772ea15d25fb8fdb0d32e557 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/i-/immer.json b/versions/i-/immer.json
index f22fb87..0ab115f 100644
--- a/versions/i-/immer.json
+++ b/versions/i-/immer.json
@@ -5,11 +5,6 @@
       "version-date": "2021-05-03",
       "port-version": 0
     },
-    {
-      "git-tree": "109831691a62c81c985e8652aa7e1f073d776660",
-      "version-string": "2021-05-03",
-      "port-version": 2
-    },
     {
       "git-tree": "515103042c70e0f9cf8d1518816d09fc6110a669",
       "version-string": "2019-06-07",

@JonLiu1993
Copy link
Member

@waybeforenow, If pr is ready for review please let me know

@waybeforenow waybeforenow marked this pull request as ready for review August 16, 2021 05:20
@waybeforenow
Copy link
Contributor Author

I've marked it as ready for review now.

@JonLiu1993 JonLiu1993 added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Aug 16, 2021
@JonLiu1993
Copy link
Member

Feature docs tested successfully in the following triplet:

  • x86-windows
  • x64-windows
  • x64-wibdows-static
  • x64-linux

@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Aug 16, 2021
@dan-shaw dan-shaw merged commit f0da48d 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-feature The issue is with a library, which is requesting new capabilities that didn’t exist 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.

3 participants