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

update rush - permanent fix for cve-2024-27980 (node security patch) (backport #6625) [release/4.5.x] #6626

Merged
merged 1 commit into from
Apr 15, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 15, 2024

Use latest version of Rush to fix security issue we had previously worked-around.

Node security issue
Rush change


This is an automatic backport of pull request #6625 done by Mergify.

…6625)

Co-authored-by: Ben Polinsky <[email protected]>
(cherry picked from commit 95a7ec0)

# Conflicts:
#	common/config/rush/pnpm-lock.yaml
Copy link
Contributor Author

mergify bot commented Apr 15, 2024

Cherry-pick of 95a7ec0 has failed:

On branch mergify/bp/release/4.5.x/pr-6625
Your branch is up to date with 'origin/release/4.5.x'.

You are currently cherry-picking commit 95a7ec0cb5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   common/config/azure-pipelines/ci.yaml
	modified:   common/config/azure-pipelines/jobs/docs-build.yaml
	modified:   common/config/azure-pipelines/jobs/fast-ci.yaml
	modified:   common/config/rush/pnpm-config.json
	modified:   common/scripts/install-run-rush-pnpm.js
	modified:   common/scripts/install-run-rush.js
	modified:   common/scripts/install-run-rushx.js
	modified:   common/scripts/install-run.js
	modified:   rush.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   common/config/rush/pnpm-lock.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ben-polinsky ben-polinsky merged commit 9cd6b98 into release/4.5.x Apr 15, 2024
15 checks passed
@ben-polinsky ben-polinsky deleted the mergify/bp/release/4.5.x/pr-6625 branch April 15, 2024 18:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants