This repository has been archived by the owner on Feb 9, 2024. It is now read-only.
[5.5.x] mark intermediate packages correctly #775
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
a-palchikov
commented
Oct 8, 2019
| return trace.NotFound("runtime version %v not found", runtimeVersion) | ||
| } | ||
| return trace.Wrap(err) | ||
| return trace.Wrap(err, "failed to sync packages for runtime version %v", runtimeVersion) |
There was a problem hiding this comment.
This also fixes an issue with shadowing package errors from the user using tele build.
| @@ -513,20 +508,21 @@ func (b *Builder) collectUpgradeDependencies() (result *libapp.Dependencies, err | |||
| return nil, trace.Wrap(err) | |||
| } | |||
| result = &libapp.Dependencies{} | |||
| for _, version := range b.UpgradeVia { | |||
| for _, runtimeVersion := range b.UpgradeVia { | |||
| app, err := apps.GetApp(loc.Runtime.WithVersion(runtimeVersion)) | |||
There was a problem hiding this comment.
Cannot use the host application to avoid pulling in and marking unrelated packages are part of this (runtimeVersion) intermediate step.
r0mant
approved these changes
Oct 8, 2019
wrapping it into a host application manifest to avoid marking unrelated dependencies as related to a specific intermediate step.
…mediate dependencies. Validate the list of packages for an intermediate step.
a-palchikov
force-pushed
the
dmitri/5.5.x/intermediate-update-build
branch
from
0a86782
to
7724f2c
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use the actual runtime application for collecting dependencies instead of wrapping it into a host application manifest to avoid marking unrelated dependencies as related to a specific intermediate step.
Fixes https://github.com/gravitational/gravity.e/issues/4231, #626.