Skip to content

test: fix zlib version regex - #48227

Merged
nodejs-github-bot merged 1 commit into
nodejs:mainfrom
lpinca:fix/version-regex
May 30, 2023
Merged

test: fix zlib version regex#48227
nodejs-github-bot merged 1 commit into
nodejs:mainfrom
lpinca:fix/version-regex

Conversation

@lpinca

@lpincalpinca commented May 28, 2023

Copy link
Copy Markdown
Member

Add support for subrevision in the regular expression for the zlib version.

Refs: https://github.com/madler/zlib/blob/48c3741002ac/zlib.h#L40

@nodejs-github-botnodejs-github-bot added needs-ci PRs that need a full CI run. test Issues and PRs related to the tests. labels May 28, 2023
@lpinca
lpincaforce-pushed the fix/version-regex branch from dce2065 to 641b4dbCompareMay 28, 2023 06:05
@lpincalpinca added the request-ci Add this label to start a Jenkins CI on a PR. label May 28, 2023
@lpinca

Copy link
Copy Markdown
MemberAuthor

Fixes CI for #48218.

@github-actionsgithub-actionsBot removed the request-ci Add this label to start a Jenkins CI on a PR. label May 28, 2023
@nodejs-github-bot

Copy link
Copy Markdown
Collaborator

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
assert.match(process.versions.zlib,/^\d+\.\d+\.\d+(?:\.\d+)?(?:-.*)?$/);
assert.match(process.versions.zlib,/^\d+(?:\.\d+){2,3}(?:-.*)?$/);

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

For consistency I would prefer to keep it as is, see line 72. I'm ok with a a new PR to shorten both regex.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For me, the reason the first regex wasn't shortened that way is that it would complicate it more than anything else. Unlike this one, which is already a little longer, and in my opinion my suggestion is just as consistent as this regex. But I understand and I don't mind a new PR.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I'm talking about this one

/^\d+\.\d+\.\d+(?:\.\d+)?-node\.\d+(?:\(candidate\))?$/
but I have no strong opinion. I will apply your suggestion.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Oh, you're completly right, sorry for my misunderstanding.

Add support for subrevision in the regular expression for the zlib
version.
Refs: https://github.com/madler/zlib/blob/48c3741002ac/zlib.h#L40
@lpinca
lpincaforce-pushed the fix/version-regex branch from 641b4db to 43c332fCompareMay 28, 2023 18:32
@lpincalpinca added the request-ci Add this label to start a Jenkins CI on a PR. label May 28, 2023
@github-actionsgithub-actionsBot removed the request-ci Add this label to start a Jenkins CI on a PR. label May 28, 2023
@nodejs-github-bot

Copy link
Copy Markdown
Collaborator

@lpincalpinca added the commit-queue Add this label to land a pull request using GitHub Actions. label May 29, 2023
@nodejs-github-botnodejs-github-bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label May 30, 2023
@nodejs-github-bot
nodejs-github-bot merged commit 6a6b3c5 into nodejs:mainMay 30, 2023
@nodejs-github-bot

Copy link
Copy Markdown
Collaborator

Landed in 6a6b3c5

targos pushed a commit that referenced this pull request May 30, 2023
Add support for subrevision in the regular expression for the zlib
version.
Refs: https://github.com/madler/zlib/blob/48c3741002ac/zlib.h#L40
PR-URL: #48227
Reviewed-By: Mestery <mestery@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@lpinca
lpinca deleted the fix/version-regex branch May 30, 2023 13:31
@targostargos mentioned this pull request Jun 4, 2023
danielleadams pushed a commit that referenced this pull request Jul 6, 2023
Add support for subrevision in the regular expression for the zlib
version.
Refs: https://github.com/madler/zlib/blob/48c3741002ac/zlib.h#L40
PR-URL: #48227
Reviewed-By: Mestery <mestery@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
MoLow pushed a commit to MoLow/node that referenced this pull request Jul 6, 2023
Add support for subrevision in the regular expression for the zlib
version.
Refs: https://github.com/madler/zlib/blob/48c3741002ac/zlib.h#L40
PR-URL: nodejs#48227
Reviewed-By: Mestery <mestery@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Ceres6 pushed a commit to Ceres6/node that referenced this pull request Aug 14, 2023
Add support for subrevision in the regular expression for the zlib
version.
Refs: https://github.com/madler/zlib/blob/48c3741002ac/zlib.h#L40
PR-URL: nodejs#48227
Reviewed-By: Mestery <mestery@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Ceres6 pushed a commit to Ceres6/node that referenced this pull request Aug 14, 2023
Add support for subrevision in the regular expression for the zlib
version.
Refs: https://github.com/madler/zlib/blob/48c3741002ac/zlib.h#L40
PR-URL: nodejs#48227
Reviewed-By: Mestery <mestery@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-ciPRs that need a full CI run.testIssues and PRs related to the tests.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@lpinca@nodejs-github-bot@jasnell@Mesteery