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.

Sign up for GitHub

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

fix(artifacts): resolving git conflicts from #4579 for release-1.30.x #4589

Merged
merged 1 commit into from
Nov 6, 2023
Merged

fix(artifacts): resolving git conflicts from #4579 for release-1.30.x #4589

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions orca-core/src/test/groovy/com/netflix/spinnaker/orca/pipeline/util/ArtifactUtilsSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,8 +492,6 @@ class ArtifactUtilsSpec extends Specification {
initialArtifacts == finalArtifacts
}

<<<<<<< HEAD
=======
def "resolve expected artifact using default artifact"() {
given:
def matchArtifact = Artifact
Expand Down Expand Up @@ -608,7 +606,6 @@ class ArtifactUtilsSpec extends Specification {
resolvedArtifacts*.getBoundArtifact() == [priorArtifact]
}

>>>>>>> 645059dc2 (fix(artifacts): Automated triggers with artifact constraints are broken if you have 2 or more of the same type (#4579))
private List<Artifact> extractTriggerArtifacts(Map<String, Object> trigger) {
return objectMapper.convertValue(trigger.artifacts, new TypeReference<List<Artifact>>(){});
}
Expand Down