[nss] Bump version to 3.87, switch to official gyp-next #28933

plq · 2023-01-13T17:26:23Z

Describe the pull request

What does your PR fix?

Bumps NSS version to 3.87
Which triplets are supported/not supported? Have you updated the CI baseline?

Windows only, No
Does your PR follow the maintainer guide?

I think it violates the one-package-per-PR rule, but see [nss] Add new ports nspr and nss #21281 where these all went in together, and these packages are all tightly coupled with each other anyway.
If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

Yes

I also had to bump msys2 libtool to 2.4.7 as the prev version downloads have gone missing

💡 Mozbuild contains a decent msys2 distribution, so maybe you can remove vcpkg_acquire_msys.cmake and switch to mozbuild instead.

github-actions

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/nspr/portfile.cmake
ports/nss/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/vcpkg-tool-gyp-next/vcpkg.json
ports/vcpkg-tool-mozbuild/vcpkg.json

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

github-actions

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 nss have changed but the version was not updated
version: 3.87
old SHA: 48994df5f8f303de50fdb98918b8896db290c9ef
new SHA: 79028f98ec7084f5c8836f49f22b56771eb95447
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/nspr/portfile.cmake
ports/nss/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/vcpkg-tool-gyp-next/vcpkg.json
ports/vcpkg-tool-mozbuild/vcpkg.json

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

github-actions

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/nspr/portfile.cmake
ports/nss/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/vcpkg-tool-gyp-next/vcpkg.json
ports/vcpkg-tool-mozbuild/vcpkg.json

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

ports/nspr/portfile.cmake

ports/nss/portfile.cmake

ports/vcpkg-tool-mozbuild/portfile.cmake

github-actions

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 1e9facc7992107ad639b4dcc87bd9a7ade1594e8 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 01ae93c..43b76c3 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5357,11 +5357,11 @@
       "port-version": 0
     },
     "nspr": {
-      "baseline": "4.33",
+      "baseline": "4.35",
       "port-version": 2
     },
     "nss": {
-      "baseline": "3.78",
+      "baseline": "3.87",
       "port-version": 0
     },
     "nsync": {
@@ -7964,6 +7964,10 @@
       "baseline": "2022-04-16",
       "port-version": 0
     },
+    "vcpkg-tool-gyp-next": {
+      "baseline": "2022-10-15",
+      "port-version": 0
+    },
     "vcpkg-tool-gyp-nss": {
       "baseline": "2022-03-04",
       "port-version": 0
@@ -7977,7 +7981,7 @@
       "port-version": 0
     },
     "vcpkg-tool-mozbuild": {
-      "baseline": "3.3",
+      "baseline": "4.0.2",
       "port-version": 0
     },
     "vcpkg-tool-ninja": {
diff --git a/versions/n-/nspr.json b/versions/n-/nspr.json
index 342fccc..e14e4c6 100644
--- a/versions/n-/nspr.json
+++ b/versions/n-/nspr.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2e83a1e30bde45f98b0f9839418c46a4bc9c317a",
+      "version": "4.35",
+      "port-version": 2
+    },
     {
       "git-tree": "a07f5ffc6f4bd4a9154a599898fbac38115c8124",
       "version": "4.33",
diff --git a/versions/n-/nss.json b/versions/n-/nss.json
index 0723715..3ed49ba 100644
--- a/versions/n-/nss.json
+++ b/versions/n-/nss.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "32eead1ba044ac8f421a76d6c6aa0b15a97706d6",
+      "version": "3.87",
+      "port-version": 0
+    },
     {
       "git-tree": "6256143502011312dc467a9c57f0955617fee6d3",
       "version": "3.78",
diff --git a/versions/v-/vcpkg-tool-gyp-next.json b/versions/v-/vcpkg-tool-gyp-next.json
index 2c15325..dcea513 100644
--- a/versions/v-/vcpkg-tool-gyp-next.json
+++ b/versions/v-/vcpkg-tool-gyp-next.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3e8daf47384d1ad92f7d7c87b9d204e659c57874",
+      "version-date": "2022-10-15",
+      "port-version": 0
+    },
     {
       "git-tree": "724d29c42ace865fdba94d8c32bdbe987072eaaa",
       "version-date": "2022-03-04",
diff --git a/versions/v-/vcpkg-tool-mozbuild.json b/versions/v-/vcpkg-tool-mozbuild.json
index 16089f3..f2086d1 100644
--- a/versions/v-/vcpkg-tool-mozbuild.json
+++ b/versions/v-/vcpkg-tool-mozbuild.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b8db95e85e9bb5fe02f81c6fdeac8042157bd777",
+      "version": "4.0.2",
+      "port-version": 0
+    },
     {
       "git-tree": "9ec0167eafba536f0f5d8a83807f6b3b0dbb50be",
       "version": "3.3",

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/nspr/portfile.cmake
ports/nss/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/vcpkg-tool-gyp-next/vcpkg.json
ports/vcpkg-tool-mozbuild/vcpkg.json

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

github-actions

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/nspr/portfile.cmake
ports/nss/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/vcpkg-tool-gyp-next/vcpkg.json
ports/vcpkg-tool-mozbuild/vcpkg.json

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

FrankXie05 · 2023-01-16T06:40:58Z

This {VERSION} is provided by vcpkg and automatically retrieves the port-version field from vcpkg.json no need for a separate set.

plq · 2023-01-16T06:44:41Z

This {VERSION} is provided by vcpkg and automatically retrieves the port-version field from vcpkg.json no need for a separate set.

Sorry, I totally missed that. Fixing again...

Also switch from gyp-nss to gyp-next, which is now the official buildgen tool

github-actions

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/nspr/portfile.cmake
ports/nss/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/vcpkg-tool-gyp-next/vcpkg.json
ports/vcpkg-tool-mozbuild/vcpkg.json

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

FrankXie05 · 2023-01-17T06:29:26Z

/azp run

azure-pipelines · 2023-01-17T06:29:36Z

Azure Pipelines successfully started running 1 pipeline(s).

BillyONeal

This is probably OK except for a nitpick in how the "removed?" port is handled. I can fix for you but need to understand specifically what happened...

ports/nss/portfile.cmake

versions/baseline.json

github-actions

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/nspr/portfile.cmake
ports/nss/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/vcpkg-tool-gyp-next/vcpkg.json
ports/vcpkg-tool-mozbuild/vcpkg.json

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

github-actions

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/nspr/portfile.cmake
ports/nss/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/vcpkg-tool-gyp-next/vcpkg.json
ports/vcpkg-tool-mozbuild/vcpkg.json

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

BillyONeal · 2023-01-27T07:49:00Z

Thanks!

ncnnnnn · 2023-11-16T08:24:09Z

File "E:\dev\vcpkg\buildtrees\nss\x64-windows-dbg\nss\out\Debug\gyp-win-tool", line 226, in ExecLinkWithManifests
our_data = our_f.read().translate(translator)
UnicodeDecodeError: 'gbk' codec can't decode byte 0xbf in position 2: illegal multibyte sequence

ncnnnnn · 2023-11-16T09:25:15Z

gyp-win-tool 226
'''
with open(our_manifest, encoding='utf-8') as our_f:
with open(assert_manifest ,encoding='utf-8') as assert_f:
'''

github-actions bot previously approved these changes Jan 13, 2023

View reviewed changes

plq dismissed github-actions[bot]’s stale review via 521d2f5 January 15, 2023 09:23

plq force-pushed the nss-3.87 branch from ffac651 to 521d2f5 Compare January 15, 2023 09:23

github-actions bot requested changes Jan 15, 2023

View reviewed changes

plq force-pushed the nss-3.87 branch from 521d2f5 to 167a88a Compare January 15, 2023 09:25

github-actions bot previously approved these changes Jan 15, 2023

View reviewed changes

plq changed the title ~~Nss 3.87~~ [nss] Bump versiotn to nss 3.87, switch to official gyp-next Jan 15, 2023

plq changed the title ~~[nss] Bump versiotn to nss 3.87, switch to official gyp-next~~ [nss] Bump version to nss 3.87, switch to official gyp-next Jan 15, 2023

plq changed the title ~~[nss] Bump version to nss 3.87, switch to official gyp-next~~ [nss] Bump version to 3.87, switch to official gyp-next Jan 15, 2023

Cheney-W assigned FrankXie05 Jan 16, 2023

FrankXie05 requested changes Jan 16, 2023

View reviewed changes

FrankXie05 added category:port-update The issue is with a library, which is requesting update new revision requires:author-response labels Jan 16, 2023

plq dismissed github-actions[bot]’s stale review via a089a62 January 16, 2023 06:33

plq force-pushed the nss-3.87 branch from 167a88a to a089a62 Compare January 16, 2023 06:33

github-actions bot requested changes Jan 16, 2023

View reviewed changes

github-actions bot previously approved these changes Jan 16, 2023

View reviewed changes

plq added 2 commits January 16, 2023 09:48

[nss] Bump version to 3.87, along with nspr 4.35 and mozbuild 4.0.2

fbe8970

Also switch from gyp-nss to gyp-next, which is now the official buildgen tool

[nss] Update versions folder

fcfbb4a

plq dismissed github-actions[bot]’s stale review via fcfbb4a January 16, 2023 06:49

plq force-pushed the nss-3.87 branch from 5fc9fc8 to fcfbb4a Compare January 16, 2023 06:49

github-actions bot previously approved these changes Jan 16, 2023

View reviewed changes

plq requested a review from FrankXie05 January 16, 2023 11:36

FrankXie05 previously approved these changes Jan 18, 2023

View reviewed changes

FrankXie05 added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Jan 18, 2023

BillyONeal requested changes Jan 18, 2023

View reviewed changes

ports/nss/portfile.cmake Show resolved Hide resolved

versions/baseline.json Outdated Show resolved Hide resolved

BillyONeal added requires:author-response and removed info:reviewed Pull Request changes follow basic guidelines labels Jan 18, 2023

plq requested a review from BillyONeal January 19, 2023 14:18

BillyONeal added 2 commits January 26, 2023 20:42

Merge remote-tracking branch 'origin/master' into HEAD

dfe2882

Fix version database.

af4168b

BillyONeal dismissed stale reviews from FrankXie05 and github-actions[bot] via af4168b January 27, 2023 04:45

github-actions bot previously approved these changes Jan 27, 2023

View reviewed changes

Fix version database more

5c7cf39

BillyONeal dismissed github-actions[bot]’s stale review via 5c7cf39 January 27, 2023 04:46

BillyONeal added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Jan 27, 2023

github-actions bot approved these changes Jan 27, 2023

View reviewed changes

BillyONeal approved these changes Jan 27, 2023

View reviewed changes

BillyONeal merged commit 368c782 into microsoft:master Jan 27, 2023

plq deleted the nss-3.87 branch January 27, 2023 09:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[nss] Bump version to 3.87, switch to official gyp-next #28933

[nss] Bump version to 3.87, switch to official gyp-next #28933

plq commented Jan 13, 2023 •

edited

Loading

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

FrankXie05 commented Jan 16, 2023

plq commented Jan 16, 2023

github-actions bot left a comment

FrankXie05 commented Jan 17, 2023

azure-pipelines bot commented Jan 17, 2023

BillyONeal left a comment

github-actions bot left a comment

github-actions bot left a comment

BillyONeal commented Jan 27, 2023

ncnnnnn commented Nov 16, 2023

ncnnnnn commented Nov 16, 2023

[nss] Bump version to 3.87, switch to official gyp-next #28933

[nss] Bump version to 3.87, switch to official gyp-next #28933

Conversation

plq commented Jan 13, 2023 • edited Loading

What does your PR fix?

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

Does your PR follow the maintainer guide?

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

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

FrankXie05 commented Jan 16, 2023

plq commented Jan 16, 2023

github-actions bot left a comment

Choose a reason for hiding this comment

FrankXie05 commented Jan 17, 2023

azure-pipelines bot commented Jan 17, 2023

BillyONeal left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

BillyONeal commented Jan 27, 2023

ncnnnnn commented Nov 16, 2023

ncnnnnn commented Nov 16, 2023

plq commented Jan 13, 2023 •

edited

Loading

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