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

deps: update undici to 5.4.0 #43262

Merged
merged 1 commit into from Jun 1, 2022
Merged

Conversation

nodejs-github-bot
Copy link
Contributor

@nodejs-github-bot nodejs-github-bot commented May 31, 2022

This is an automated update of undici to 5.4.0.

Notable Change: we dropped the limits on the forbidden headers in fetch() as a spec deviation for server-side implementations.

@nodejs-github-bot nodejs-github-bot added dependencies needs-ci labels May 31, 2022
@tniessen
Copy link
Member

@tniessen tniessen commented May 31, 2022

There is a merge conflict here; maybe because there are two update commits in this PR?

@panva
Copy link
Member

@panva panva commented May 31, 2022

There is a merge conflict here; maybe because there are two update commits in this PR?

@nodejs/undici

@Trott
Copy link
Member

@Trott Trott commented May 31, 2022

There is a merge conflict here; maybe because there are two update commits in this PR?

I think I've seen this in other updates. After the authors or eslint updates are merged, I always delete the branch to avoid this. Notice that there are two commits here. So that's almost surely what happened here too.

@Trott
Copy link
Member

@Trott Trott commented May 31, 2022

There is a merge conflict here; maybe because there are two update commits in this PR?

I think I've seen this in other updates. After the authors or eslint updates are merged, I always delete the branch to avoid this. Notice that there are two commits here. So that's almost surely what happened here too.

Might be a good idea for someone to change all the update GitHub jobs to delete the existing branch before creating the pull request.

@Trott Trott force-pushed the actions/tools-update-undici branch from c33f2de to 38ecb99 Compare May 31, 2022
@Trott
Copy link
Member

@Trott Trott commented May 31, 2022

I fixed the branch with the following commands:

git checkout actions/tools-update-undici
git reset --hard upstream/actions/tools-update-undici
git rebase -i upstream/master
git push --force-with-lease upstream actions/tools-update-undici

panva
panva approved these changes May 31, 2022
@Trott Trott added request-ci author ready labels May 31, 2022
@github-actions github-actions bot removed the request-ci label May 31, 2022
@nodejs-github-bot

This comment was marked as outdated.

Copy link
Member

@mcollina mcollina left a comment

lgtm

@nodejs-github-bot
Copy link
Contributor Author

@nodejs-github-bot nodejs-github-bot commented May 31, 2022

@mcollina mcollina added the notable-change label May 31, 2022
@mcollina mcollina mentioned this pull request May 31, 2022
@mcollina mcollina added the fast-track label May 31, 2022
@github-actions
Copy link

@github-actions github-actions bot commented May 31, 2022

Fast-track has been requested by @mcollina. Please 👍 to approve.

@nodejs-github-bot
Copy link
Contributor Author

@nodejs-github-bot nodejs-github-bot commented Jun 1, 2022

@nodejs-github-bot
Copy link
Contributor Author

@nodejs-github-bot nodejs-github-bot commented Jun 1, 2022

@nodejs-github-bot
Copy link
Contributor Author

@nodejs-github-bot nodejs-github-bot commented Jun 1, 2022

@nodejs-github-bot
Copy link
Contributor Author

@nodejs-github-bot nodejs-github-bot commented Jun 1, 2022

@mcollina mcollina added commit-queue and removed needs-ci labels Jun 1, 2022
@mcollina mcollina added the commit-queue-squash label Jun 1, 2022
@nodejs-github-bot nodejs-github-bot removed the commit-queue label Jun 1, 2022
@nodejs-github-bot nodejs-github-bot merged commit 921ef9b into master Jun 1, 2022
57 checks passed
@nodejs-github-bot
Copy link
Contributor Author

@nodejs-github-bot nodejs-github-bot commented Jun 1, 2022

Landed in 921ef9b

@aduh95 aduh95 deleted the actions/tools-update-undici branch Jun 1, 2022
bengl pushed a commit that referenced this issue Jun 1, 2022
PR-URL: #43262
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
bengl added a commit that referenced this issue Jun 1, 2022
Notable changes:

* deps: update undici to 5.4.0  (Node.js GitHub Bot) #43262
* (SEMVER-MINOR) util: add parseArgs module (Benjamin Coe) #42675
* (SEMVER-MINOR) http: add uniqueHeaders option to request and createServer (Paolo Insogna) #41397
* deps: upgrade npm to 8.11.0 (npm team) #43210
* deps: patch V8 to 10.2.154.4 (Michaël Zasso) #43067
* (SEMVER-MINOR) deps: update V8 to 10.2.154.2 (Michaël Zasso) #42740
* (SEMVER-MINOR) fs: make params in writing methods optional (LiviaMedeiros) #42601
* (SEMVER-MINOR) http: add uniqueHeaders option to request and createServer (Paolo Insogna) #41397
* (SEMVER-MINOR) net: add ability to reset a tcp socket (pupilTong) #43112
* (SEMVER-MINOR) Revert "build: make x86 Windows support temporarily experimental" (Michaël Zasso) [#42740](#42740)
  * This means 32-bit Windows binaries are back with this release.

PR-URL: #43266
bengl added a commit that referenced this issue Jun 2, 2022
Notable changes:

* deps: update undici to 5.4.0  (Node.js GitHub Bot) #43262
* (SEMVER-MINOR) util: add parseArgs module (Benjamin Coe) #42675
* (SEMVER-MINOR) http: add uniqueHeaders option to request and createServer (Paolo Insogna) #41397
* deps: upgrade npm to 8.11.0 (npm team) #43210
* deps: patch V8 to 10.2.154.4 (Michaël Zasso) #43067
* (SEMVER-MINOR) deps: update V8 to 10.2.154.2 (Michaël Zasso) #42740
* (SEMVER-MINOR) fs: make params in writing methods optional (LiviaMedeiros) #42601
* (SEMVER-MINOR) http: add uniqueHeaders option to request and createServer (Paolo Insogna) #41397
* (SEMVER-MINOR) net: add ability to reset a tcp socket (pupilTong) #43112
* (SEMVER-MINOR) Revert "build: make x86 Windows support temporarily experimental" (Michaël Zasso) [#42740](#42740)
  * This means 32-bit Windows binaries are back with this release.

PR-URL: #43266
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
author ready commit-queue-squash dependencies fast-track notable-change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants