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

Attempt to fix another structured-merge-diff failures. #3348

Merged
merged 1 commit into from
Oct 7, 2020

Conversation

mattmoor
Copy link
Member

@mattmoor mattmoor commented Oct 6, 2020

Changes

Drop the pointer on the inline field to avoid panics in structured-merge-diff in CLI.

Submitter Checklist

These are the criteria that every PR should meet, please check them off as you
review them:

  • Includes tests (if functionality changed/added)
  • Includes docs (if user facing)
  • Commit messages follow commit message best practices
  • Release notes block has been filled in or deleted (only if no user facing changes)

See the contribution guide for more details.

Double check this list of stuff that's easy to miss:

Reviewer Notes

If API changes are included, additive changes must be approved by at least two OWNERS and backwards incompatible changes must be approved by more than 50% of the OWNERS, and they must first be added in a backwards compatible way.

Release Notes

action required: Drop pointers from inline struct when embedding TaskSpec in v1beta1

@tekton-robot tekton-robot added release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 6, 2020
@mattmoor
Copy link
Member Author

mattmoor commented Oct 6, 2020

/kind bug

@tekton-robot tekton-robot added the kind/bug Categorizes issue or PR as related to a bug. label Oct 6, 2020
@mattmoor
Copy link
Member Author

mattmoor commented Oct 6, 2020

/assign @imjasonh @vdemeester

This is another issue I hit pulling the latest pipelines into CLI, but with this change it's passing: tektoncd/cli#1198

The meat of this change is the diff in pkg/apis/pipeline/v1beta1/pipeline_types.go which drops the pointer from:

      TaskSpec `json:",inline,omitempty"`

From a serialization perspective, I'd expect these to be virtually identical because every field of TaskSpec is itself omitempty.

@afrittoli
Copy link
Member

/test check-pr-has-kind-label

Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 7, 2020
@imjasonh
Copy link
Member

imjasonh commented Oct 7, 2020

/approve

@tekton-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ImJasonH

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

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 7, 2020
@tekton-robot tekton-robot merged commit 9611f3e into tektoncd:master Oct 7, 2020
@mattmoor mattmoor deleted the more-smd-failures branch October 7, 2020 17:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. 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