Fix GCB build failure for multi-module Jib projects #3852
Merged
Conversation
This file contains hidden or 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
TadCordle
requested review from
balopat,
briandealwis,
chanseokoh,
dgageot,
loosebazooka,
nkubala and
tejal29
as code owners
Codecov Report
|
| @@ -57,3 +59,25 @@ func (b *Builder) jibBuildSpec(artifact *latest.Artifact, tag string) (cloudbuil | |||
| func fixHome(command string, args []string) []string { | |||
| return []string{"-c", command + " -Duser.home=$$HOME " + strings.Join(args, " ")} | |||
| } | |||
|
|
|||
| func jibAddWorkspaceToDependencies(workspace string, dependencies []string) ([]string, error) { | |||
| dependencyMap := make(map[string]bool) | |||
There was a problem hiding this comment.
Maybe we should expose util's orderedFileSet. @nkubala ?
|
Any idea what's going on with the linter? |
|
It was having a bad day — worked after a restart. |
balopat
approved these changes
Apr 2, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Putting this up for now, despite it being a bit hacky. There's an issue with using multi-module Jib projects with GCB; since each module is uploaded separately, the build fails due to missing dependencies. The workaround in this PR involves just uploading the entire workspace (with
target/andbuild/filtered out). Since the build is also done in parallel, this also means the workspace is uploaded once for each module.Fixes #3477.