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

rush update --full (backport #7072) [release/4.8.x] #7086

Merged
merged 8 commits into from
Aug 14, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 14, 2024

ran rush update --full, update storage-blob deps as that prevented a successful build

pr with changes from storage dep changes: iTwin/object-storage#114

pmconne and others added 5 commits August 14, 2024 17:19
(cherry picked from commit 30584ce)

# Conflicts:
#	common/config/rush/pnpm-lock.yaml
#	core/backend/package.json
#	core/common/package.json
#	core/frontend/package.json
#	full-stack-tests/core/package.json
#	test-apps/display-test-app/package.json
Co-authored-by: Arun George <11051042+aruniverse@users.noreply.github.com>
Co-authored-by: Arun George <aruniverse@users.noreply.github.com>
Co-authored-by: Hoang Nam Le <50554904+hl662@users.noreply.github.com>
(cherry picked from commit 7405304)

# Conflicts:
#	common/config/rush/pnpm-lock.yaml
#	core/backend/package.json
@mergify mergify bot requested a review from a team as a code owner August 14, 2024 18:39
@mergify mergify bot added the conflicts label Aug 14, 2024
@mergify mergify bot requested review from a team, bbastings, aruniverse and ben-polinsky as code owners August 14, 2024 18:39
Copy link
Contributor Author

mergify bot commented Aug 14, 2024

Cherry-pick of 7405304 has failed:

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

You are currently cherry-picking commit 7405304a5c.
  (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:
	new file:   common/changes/@itwin/core-backend/rush-update-full_2024-08-09-18-54.json
	new file:   common/changes/@itwin/core-common/rush-update-full_2024-08-09-18-54.json
	new file:   common/changes/@itwin/core-frontend/rush-update-full_2024-08-09-18-54.json
	modified:   core/common/package.json
	modified:   core/frontend/package.json
	modified:   example-code/snippets/package.json
	modified:   full-stack-tests/backend/package.json
	modified:   full-stack-tests/core/package.json
	modified:   full-stack-tests/core/webpack.config.js
	modified:   test-apps/display-test-app/package.json

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

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

@mergify mergify bot mentioned this pull request Aug 14, 2024
@mergify mergify bot requested a review from a team August 14, 2024 18:39
@ben-polinsky ben-polinsky enabled auto-merge (squash) August 14, 2024 18:42
Copy link
Member

@aruniverse aruniverse left a comment

Choose a reason for hiding this comment

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

approving, might want to merge the changes from #7085 into here, because this will fail the audit atm

@ben-polinsky
Copy link
Contributor

approving, might want to merge the changes from #7085 into here, because this will fail the audit atm

yeah I whitelisted the CVE manually, thanks

@aruniverse aruniverse disabled auto-merge August 14, 2024 19:33
@aruniverse aruniverse merged commit ded6363 into release/4.8.x Aug 14, 2024
16 checks passed
@aruniverse aruniverse deleted the mergify/bp/release/4.8.x/pr-7072 branch August 14, 2024 19:33
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.

3 participants