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

tiltfile: properly model filewatches shared across multiple images #5648

Merged
merged 1 commit into from Apr 1, 2022

Conversation

nicks
Copy link
Member

@nicks nicks commented Mar 31, 2022

Hello @landism, @nicksieger,

Please review the following commits I made in branch nicks/every2:

f289f7a (2022-03-31 17:41:50 -0400)
tiltfile: properly model filewatches shared across multiple images
fixes #5621

Code review reminders, by giving a LGTM you attest that:

  • Commits are adequately tested
  • Code is easy to understand and conforms to style guides
  • Incomplete code is marked with TODOs
  • Code is suitably instrumented with logging and metrics

@@ -531,6 +563,11 @@ func toImageMapObjects(tlr *tiltfile.TiltfileLoadResult, disableSources disableS
}

name := iTarget.ImageMapName()
_, ok := result[name]
if ok {
continue
Copy link
Member

Choose a reason for hiding this comment

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

Do we not need to merge disable sources here as well? (or I guess this PR is about filewatches anyway)

Copy link
Member

Choose a reason for hiding this comment

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

just saw the other PR, ignore

Comment on lines 571 to 572
// Note that an ImageMap might be in more than one Manifest, so we
// can't annotate them to a particular manifest.
Copy link
Member

Choose a reason for hiding this comment

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

unrelated to this PR, feel free to ignore - it looks like a few lines down we are annotating them to a particular manifest

Copy link
Member Author

Choose a reason for hiding this comment

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

removed!

Copy link
Member

@nicksieger nicksieger left a comment

Choose a reason for hiding this comment

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

Sweet!

@nicks nicks merged commit 7f9d7cc into master Apr 1, 2022
@nicks nicks deleted the nicks/every2 branch April 1, 2022 16:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Disabled resource behavior with images shared by multiple resources
3 participants