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.

Sign up for GitHub

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

Jump to bottom

deps: update zlib to upstream 926ac23 #44412

Closed
wants to merge 9 commits into from
Closed

deps: update zlib to upstream 926ac23 #44412

wants to merge 9 commits into from

Conversation

RafaelGSS
Copy link
Member

Updated as described in doc/contributing/maintaining-zlib.md.

Attempt to solve: nodejs/security-wg#824

@nodejs-github-bot nodejs-github-bot added dependencies Pull requests that update a dependency file. needs-ci PRs that need a full CI run. zlib Issues and PRs related to the zlib subsystem. labels Aug 26, 2022
jasnell
jasnell approved these changes Aug 28, 2022
View reviewed changes
Copy link
Member

@jasnell jasnell left a comment

Choose a reason for hiding this comment

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

RSLGTM

This was referenced Aug 29, 2022
Closed
Closed
@targos
Copy link
Member

targos commented Aug 29, 2022

As I said in #44254 (comment), we have to adapt zlib.gyp somehow.

@RafaelGSS
Copy link
Member Author

As I said in #44254 (comment), we have to adapt zlib.gyp somehow.

Yeah, I'll try to work on it this week.

@RafaelGSS RafaelGSS added the request-ci Add this label to start a Jenkins CI on a PR. label Sep 2, 2022
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Sep 2, 2022
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/46392/

@github-actions github-actions bot mentioned this pull request Sep 3, 2022
Open
25 tasks
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/46404/

@github-actions github-actions bot mentioned this pull request Sep 4, 2022
Open
24 tasks
@RaisinTen RaisinTen added the needs-benchmark-ci PR that need a benchmark CI run. label Sep 4, 2022
This was referenced Sep 5, 2022
Open
Open
@RafaelGSS RafaelGSS added the request-ci Add this label to start a Jenkins CI on a PR. label Sep 6, 2022
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Sep 6, 2022
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/46430/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/46448/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/46456/

@github-actions github-actions bot mentioned this pull request Sep 7, 2022
Open
15 tasks
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/46458/

@targos
Copy link
Member

targos commented Sep 7, 2022

Don't we need ab587ca anymore?

@RafaelGSS
Copy link
Member Author

Don't we need ab587ca anymore?

fill_window_sse.c was removed. The chunkcopy still exists but the failing test doesn't seem related to this file.

@targos
Copy link
Member

targos commented Sep 7, 2022

It's not related to the failing test. This commit fixed #35629

@github-actions github-actions bot mentioned this pull request Sep 8, 2022
Open
12 tasks
@RafaelGSS
Copy link
Member Author

I'll trigger the build again just to see if I get a different build output. The last ones don't show anything relevant to me. I've set up a Windows x64 machine to see if I can reproduce this behaviour, but didn't work (it's building without issues).

@RafaelGSS RafaelGSS added the request-ci Add this label to start a Jenkins CI on a PR. label Sep 8, 2022
@github-actions github-actions bot mentioned this pull request Oct 30, 2022
Open
15 tasks
RaisinTen
RaisinTen reviewed Oct 30, 2022
View reviewed changes
deps/zlib/zlib.gyp
@@ -18,6 +18,7 @@
'adler32.c',
'compress.c',
'contrib/optimizations/insert_string.h',
'cpu_features.c',
Copy link
Contributor

Choose a reason for hiding this comment

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

Since we are adding cpu_features.c to sources here already, is there any need to re-add it to the sources below? I guess we could treat the cpu_features.h file too in the same way.

Copy link
Member Author

Choose a reason for hiding this comment

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

I think that makes sense. Look afb64b0

@github-actions github-actions bot mentioned this pull request Oct 31, 2022
Open
19 tasks
@RafaelGSS RafaelGSS added the request-ci Add this label to start a Jenkins CI on a PR. label Oct 31, 2022
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Oct 31, 2022
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/47597/

RaisinTen
RaisinTen approved these changes Oct 31, 2022
View reviewed changes
Copy link
Contributor

@RaisinTen RaisinTen left a comment

Choose a reason for hiding this comment

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

LGTM

@github-actions github-actions bot mentioned this pull request Nov 1, 2022
Open
17 tasks
@lpinca lpinca mentioned this pull request Nov 1, 2022
Closed
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/47625/

This was referenced Nov 2, 2022
Open
Open
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/47719/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/47731/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/47747/

@github-actions github-actions bot mentioned this pull request Nov 7, 2022
Open
18 tasks
@baparham
Copy link

baparham commented Nov 7, 2022

FWIW upstream (chromium zlib fork) just landed the update to canonical zlib 1.2.13 in https://chromium.googlesource.com/chromium/src/+/e2e230364bcf8fe55dde5dca8310da6906ae64ad

Since this isn't merged in yet, it would make sense to push for upgrading Node.js to this latest version. Or does it make more sense to do it in two stages?

This was referenced Nov 8, 2022
Open
Open
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/47801/

@RafaelGSS
Copy link
Member Author

RafaelGSS commented Nov 9, 2022 •
edited
Loading

FWIW upstream (chromium zlib fork) just landed the update to canonical zlib 1.2.13 in https://chromium.googlesource.com/chromium/src/+/e2e230364bcf8fe55dde5dca8310da6906ae64ad

Since this isn't merged in yet, it would make sense to push for upgrading Node.js to this latest version. Or does it make more sense to do it in two stages?

I prefer to do it in two stages, considering the fact this PR changes the .gyp files.

FWIW All the CI failures are non-related to the PR (no space left, windows race condition bug , and so forth)

@lpinca lpinca mentioned this pull request Nov 9, 2022
Closed
@lpinca
Copy link
Member

lpinca commented Nov 9, 2022

I've opened #45387 for a direct update to upstream 8bbd6c31.

@RafaelGSS
Copy link
Member Author

Closing in favor of #45387

@RafaelGSS RafaelGSS closed this Nov 9, 2022
This was referenced Nov 10, 2022
Open
Open
Open
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pbo-linaro pbo-linaro pbo-linaro left review comments

@jasnell jasnell jasnell approved these changes

@mhdawson mhdawson mhdawson approved these changes

@RaisinTen RaisinTen RaisinTen approved these changes

@targos targos Awaiting requested review from targos

Assignees
No one assigned
Labels
dependencies Pull requests that update a dependency file. needs-benchmark-ci PR that need a benchmark CI run. needs-ci PRs that need a full CI run. zlib Issues and PRs related to the zlib subsystem.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.