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

Checking if artifact image is nil #4114

Merged
merged 2 commits into from
Nov 16, 2022

Conversation

jonahjon
Copy link
Contributor

Signed-off-by: jonahjon jonahjones094@gmail.com

Issue #, if available:

Description of changes:

Testing (if applicable):

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Signed-off-by: jonahjon <jonahjones094@gmail.com>
@jonahjon jonahjon requested a review from junshun November 16, 2022 19:50
@eks-distro-bot eks-distro-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 16, 2022
@junshun
Copy link
Member

junshun commented Nov 16, 2022

/lgtm

Copy link
Contributor

@TerryHowe TerryHowe left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: TerryHowe

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Signed-off-by: jonahjon <jonahjones094@gmail.com>
@eks-distro-bot eks-distro-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed lgtm size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 16, 2022
@junshun
Copy link
Member

junshun commented Nov 16, 2022

/lgtm

@jonahjon jonahjon merged commit e550d4b into aws:main Nov 16, 2022
@jonahjon
Copy link
Contributor Author

/cherrypick release-0.12

@eks-distro-pr-bot
Copy link
Contributor

@jonahjon: #4114 failed to apply on top of branch "release-0.12":

Applying: checking if artifact image is nil
Using index info to reconstruct a base tree...
M	release/pkg/helm/helm.go
Falling back to patching base and 3-way merge...
Auto-merging release/pkg/helm/helm.go
CONFLICT (content): Merge conflict in release/pkg/helm/helm.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 checking if artifact image is nil
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-0.12

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@jonahjon
Copy link
Contributor Author

/cherrypick release-0.12

@eks-distro-pr-bot
Copy link
Contributor

@jonahjon: new pull request created: #4119

In response to this:

/cherrypick release-0.12

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants