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

fix: bump min cdk version to 2.28.0 to use node 14 (backport #300) #312

Merged
merged 2 commits into from
Jun 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 14, 2023

This is an automatic backport of pull request #300 done by Mergify.
Cherry-pick of 511e534 has failed:

On branch mergify/bp/kubectl-v26/main/pr-300
Your branch is up to date with 'origin/kubectl-v26/main'.

You are currently cherry-picking commit 511e534.
  (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:   .gitattributes
	modified:   .gitignore
	new file:   .gitpod.yml
	modified:   .projen/deps.json
	modified:   .projen/files.json
	modified:   .projenrc.ts
	modified:   CONTRIBUTING.md
	modified:   package.json
	modified:   yarn.lock

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   API.md
	both modified:   test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.assets.json
	both modified:   test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.template.json

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

- As node12 runtime has been deprecated, the integration test using [email protected] synthesizes the custom resource provider with runtime node12 which fails the deployment. We should use nodejs14 instead. And the minimal CDK release for node14 custom resource runtime is [2.28.0](https://github.com/aws/aws-cdk/releases/tag/v2.28.0).
- update contributing guide to execute the command with `npx projen` to avoid confusion.
- generate `.gitpod.yml` from projen to use the jsii/superchain container image that comes with everything required to run the `yarn build`.

(cherry picked from commit 511e534)

# Conflicts:
#	API.md
#	test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.assets.json
#	test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.template.json
@mergify mergify bot merged commit ae4eaf3 into kubectl-v26/main Jun 14, 2023
@mergify mergify bot deleted the mergify/bp/kubectl-v26/main/pr-300 branch June 14, 2023 21:46
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