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

tools: automate zlib update #47417

Merged

Conversation

marco-ippolito
Copy link
Member

@marco-ippolito marco-ippolito commented Apr 5, 2023

Refs: nodejs/security-wg#828
@nodejs/security-wg

@nodejs-github-bot
Copy link
Collaborator

Review requested:

  • @nodejs/actions

@marco-ippolito marco-ippolito requested a review from lpinca April 5, 2023 10:00
@nodejs-github-bot nodejs-github-bot added meta Issues and PRs related to the general management of the project. tools Issues and PRs related to the tools directory. labels Apr 5, 2023
@marco-ippolito marco-ippolito force-pushed the feat/automate-zlib-update branch 2 times, most recently from 6f313cd to c9f1101 Compare April 5, 2023 12:08

CURRENT_VERSION=$(grep "#define ZLIB_VERSION" "$DEPS_DIR/zlib/zlib.h" | sed -n "s/^.*VERSION \"\(.*\)\"/\1/p")

NEW_VERSION_ZLIB_H=$(curl -s "https://chromium.googlesource.com/chromium/src/+/refs/heads/main/third_party/zlib/zlib.h?format=TEXT" | base64 --decode)
Copy link
Member

Choose a reason for hiding this comment

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

This works but it might remain the same for a very long time. It is not very useful. We refer to the tip of the remote main branch to check if an update is needed. However, afaik, we store the current commit SHA only in the commit message.

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 havent found any other solution to check what's the latest version, I think this might be a reasonable compromise and its not very expensive

Copy link
Member

@lpinca lpinca Apr 5, 2023

Choose a reason for hiding this comment

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

That's fine but it probably won't find a new version for years. See https://github.com/madler/zlib/tags.

Copy link
Member

Choose a reason for hiding this comment

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

@lpinca are you saying that we typically update to something that is not a new release? If so then an option in the script/action to say generate PR based on commit X instead of a new version might make sense.

Copy link
Member

Choose a reason for hiding this comment

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

are you saying that we typically update to something that is not a new release?

Yes, exactly.

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 we should probably change it in the future to something like @tniessen did in this PR #47482

tools/dep_updaters/update-zlib.sh Outdated Show resolved Hide resolved
Copy link
Contributor

@ShogunPanda ShogunPanda left a comment

Choose a reason for hiding this comment

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

LGTM!

@marco-ippolito marco-ippolito added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Apr 7, 2023
@marco-ippolito marco-ippolito force-pushed the feat/automate-zlib-update branch 2 times, most recently from b02200c to ef67324 Compare April 11, 2023 14:23
@marco-ippolito marco-ippolito added the commit-queue Add this label to land a pull request using GitHub Actions. label Apr 12, 2023
@nodejs-github-bot nodejs-github-bot added commit-queue-failed An error occurred while landing this pull request using GitHub Actions. and removed commit-queue Add this label to land a pull request using GitHub Actions. labels Apr 12, 2023
@nodejs-github-bot
Copy link
Collaborator

Commit Queue failed
- Loading data for nodejs/node/pull/47417
✔  Done loading data for nodejs/node/pull/47417
----------------------------------- PR info ------------------------------------
Title      tools: automate zlib update (#47417)
Author     Marco Ippolito  (@marco-ippolito)
Branch     marco-ippolito:feat/automate-zlib-update -> nodejs:main
Labels     meta, tools, author ready
Commits    1
 - tools: automate zlib update
Committers 1
 - Marco Ippolito 
PR-URL: https://github.com/nodejs/node/pull/47417
Refs: https://github.com/nodejs/security-wg/issues/828
Reviewed-By: Paolo Insogna 
Reviewed-By: Luigi Pinca 
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/47417
Refs: https://github.com/nodejs/security-wg/issues/828
Reviewed-By: Paolo Insogna 
Reviewed-By: Luigi Pinca 
--------------------------------------------------------------------------------
   ⚠  Commits were pushed since the last review:
   ⚠  - tools: automate zlib update
   ℹ  This PR was created on Wed, 05 Apr 2023 09:59:59 GMT
   ✔  Approvals: 2
   ✔  - Paolo Insogna (@ShogunPanda): https://github.com/nodejs/node/pull/47417#pullrequestreview-1376059006
   ✔  - Luigi Pinca (@lpinca): https://github.com/nodejs/node/pull/47417#pullrequestreview-1376413213
   ⚠  This PR has conflicts that must be resolved
   ✔  Last GitHub CI successful
   ℹ  Green GitHub CI is sufficient
--------------------------------------------------------------------------------
   ✔  Aborted `git node land` session in /home/runner/work/node/node/.ncu
https://github.com/nodejs/node/actions/runs/4678748046

@marco-ippolito marco-ippolito force-pushed the feat/automate-zlib-update branch from ef67324 to 7194af1 Compare April 12, 2023 13:28
Copy link
Member

@RafaelGSS RafaelGSS left a comment

Choose a reason for hiding this comment

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

LGTM. Rebase to resolve the conflicts

@marco-ippolito marco-ippolito force-pushed the feat/automate-zlib-update branch from 7194af1 to 4c1a1a5 Compare April 17, 2023 07:23
@marco-ippolito marco-ippolito added commit-queue Add this label to land a pull request using GitHub Actions. and removed commit-queue-failed An error occurred while landing this pull request using GitHub Actions. labels Apr 17, 2023
@nodejs-github-bot nodejs-github-bot added commit-queue-failed An error occurred while landing this pull request using GitHub Actions. and removed commit-queue Add this label to land a pull request using GitHub Actions. labels Apr 17, 2023
@nodejs-github-bot
Copy link
Collaborator

Commit Queue failed
- Loading data for nodejs/node/pull/47417
✔  Done loading data for nodejs/node/pull/47417
----------------------------------- PR info ------------------------------------
Title      tools: automate zlib update (#47417)
Author     Marco Ippolito  (@marco-ippolito)
Branch     marco-ippolito:feat/automate-zlib-update -> nodejs:main
Labels     meta, tools, author ready
Commits    1
 - tools: automate zlib update
Committers 1
 - Marco Ippolito 
PR-URL: https://github.com/nodejs/node/pull/47417
Refs: https://github.com/nodejs/security-wg/issues/828
Reviewed-By: Paolo Insogna 
Reviewed-By: Luigi Pinca 
Reviewed-By: Rafael Gonzaga 
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/47417
Refs: https://github.com/nodejs/security-wg/issues/828
Reviewed-By: Paolo Insogna 
Reviewed-By: Luigi Pinca 
Reviewed-By: Rafael Gonzaga 
--------------------------------------------------------------------------------
   ⚠  Commits were pushed since the last review:
   ⚠  - tools: automate zlib update
   ℹ  This PR was created on Wed, 05 Apr 2023 09:59:59 GMT
   ✔  Approvals: 3
   ✔  - Paolo Insogna (@ShogunPanda): https://github.com/nodejs/node/pull/47417#pullrequestreview-1376059006
   ✔  - Luigi Pinca (@lpinca): https://github.com/nodejs/node/pull/47417#pullrequestreview-1376413213
   ✔  - Rafael Gonzaga (@RafaelGSS) (TSC): https://github.com/nodejs/node/pull/47417#pullrequestreview-1386302187
   ✔  Last GitHub CI successful
   ℹ  Green GitHub CI is sufficient
--------------------------------------------------------------------------------
   ✔  Aborted `git node land` session in /home/runner/work/node/node/.ncu
https://github.com/nodejs/node/actions/runs/4723740689

@marco-ippolito marco-ippolito removed the commit-queue-failed An error occurred while landing this pull request using GitHub Actions. label Apr 18, 2023
@marco-ippolito marco-ippolito added the commit-queue Add this label to land a pull request using GitHub Actions. label Apr 18, 2023
@nodejs-github-bot nodejs-github-bot added commit-queue-failed An error occurred while landing this pull request using GitHub Actions. and removed commit-queue Add this label to land a pull request using GitHub Actions. labels Apr 18, 2023
@nodejs-github-bot
Copy link
Collaborator

Commit Queue failed
- Loading data for nodejs/node/pull/47417
✔  Done loading data for nodejs/node/pull/47417
----------------------------------- PR info ------------------------------------
Title      tools: automate zlib update (#47417)
Author     Marco Ippolito  (@marco-ippolito)
Branch     marco-ippolito:feat/automate-zlib-update -> nodejs:main
Labels     meta, tools, author ready
Commits    1
 - tools: automate zlib update
Committers 1
 - Marco Ippolito 
PR-URL: https://github.com/nodejs/node/pull/47417
Refs: https://github.com/nodejs/security-wg/issues/828
Reviewed-By: Paolo Insogna 
Reviewed-By: Luigi Pinca 
Reviewed-By: Rafael Gonzaga 
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/47417
Refs: https://github.com/nodejs/security-wg/issues/828
Reviewed-By: Paolo Insogna 
Reviewed-By: Luigi Pinca 
Reviewed-By: Rafael Gonzaga 
--------------------------------------------------------------------------------
   ⚠  Commits were pushed since the last review:
   ⚠  - tools: automate zlib update
   ℹ  This PR was created on Wed, 05 Apr 2023 09:59:59 GMT
   ✔  Approvals: 3
   ✔  - Paolo Insogna (@ShogunPanda): https://github.com/nodejs/node/pull/47417#pullrequestreview-1376059006
   ✔  - Luigi Pinca (@lpinca): https://github.com/nodejs/node/pull/47417#pullrequestreview-1376413213
   ✔  - Rafael Gonzaga (@RafaelGSS) (TSC): https://github.com/nodejs/node/pull/47417#pullrequestreview-1386302187
   ✔  Last GitHub CI successful
   ℹ  Green GitHub CI is sufficient
--------------------------------------------------------------------------------
   ✔  Aborted `git node land` session in /home/runner/work/node/node/.ncu
https://github.com/nodejs/node/actions/runs/4730739601

Copy link
Member

@mhdawson mhdawson left a comment

Choose a reason for hiding this comment

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

LGTM with a question.

@marco-ippolito marco-ippolito added commit-queue Add this label to land a pull request using GitHub Actions. and removed commit-queue-failed An error occurred while landing this pull request using GitHub Actions. labels Apr 19, 2023
@nodejs-github-bot nodejs-github-bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Apr 19, 2023
@nodejs-github-bot nodejs-github-bot merged commit 8f879de into nodejs:main Apr 19, 2023
@nodejs-github-bot
Copy link
Collaborator

Landed in 8f879de

targos pushed a commit that referenced this pull request May 2, 2023
PR-URL: #47417
Refs: nodejs/security-wg#828
Reviewed-By: Paolo Insogna <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Rafael Gonzaga <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
@targos targos mentioned this pull request May 2, 2023
danielleadams pushed a commit that referenced this pull request Jul 6, 2023
PR-URL: #47417
Refs: nodejs/security-wg#828
Reviewed-By: Paolo Insogna <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Rafael Gonzaga <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
MoLow pushed a commit to MoLow/node that referenced this pull request Jul 6, 2023
PR-URL: nodejs#47417
Refs: nodejs/security-wg#828
Reviewed-By: Paolo Insogna <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Rafael Gonzaga <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
author ready PRs that have at least one approval, no pending requests for changes, and a CI started. meta Issues and PRs related to the general management of the project. tools Issues and PRs related to the tools directory.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants