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

chore: update v5 config (use jsii 5.4 to build package) (backport #1252) #1254

Merged
merged 2 commits into from
Apr 28, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 28, 2024


This is an automatic backport of pull request #1252 done by [Mergify](https://mergify.com).

(cherry picked from commit 9bda400)

# Conflicts:
#	.projen/deps.json
#	package-lock.json
#	package.json
Copy link
Author

mergify bot commented Apr 28, 2024

Cherry-pick of 9bda400 has failed:

On branch mergify/bp/v4/pr-1252
Your branch is up to date with 'origin/v4'.

You are currently cherry-picking commit 9bda400.
  (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:   .projenrc.ts

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .projen/deps.json
	both modified:   package-lock.json
	both modified:   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

@mrgrain mrgrain changed the title fix: use jsii 5.4 to build package (backport #1252) chore: update v5 config (use jsii 5.4 to build package) (backport #1252) Apr 28, 2024
@mergify mergify bot merged commit 46c5f0a into v4 Apr 28, 2024
15 checks passed
@mergify mergify bot deleted the mergify/bp/v4/pr-1252 branch April 28, 2024 18:35
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.

None yet

1 participant