Эх сурвалжийг харах

Merge pull request #3193 from infosiftr/diff-pr-arches

Use the first arch of each entry in "diff-pr.sh"
yosifkit 8 жил өмнө
parent
commit
794dac5747
1 өөрчлөгдсөн 15 нэмэгдсэн , 16 устгасан
  1. 15 16
      diff-pr.sh

+ 15 - 16
diff-pr.sh

@@ -107,22 +107,21 @@ sharedTagsListTemplate='
 # TODO something less hacky than "git archive" hackery, like a "bashbrew archive" or "bashbrew context" or something
 template='
 	{{- range $.Entries -}}
-		{{- if .HasArchitecture arch -}}
-			{{- $from := $.DockerFrom . -}}
-			git -C "$BASHBREW_CACHE/git" archive --format=tar
-			{{- " " -}}
-			{{- "--prefix=" -}}
-			{{- $.RepoName -}}
-			_
-			{{- .Tags | last -}}
-			{{- "/" -}}
-			{{- " " -}}
-			{{- .ArchGitCommit arch -}}
-			{{- ":" -}}
-			{{- $dir := .ArchDirectory arch -}}
-			{{- (eq $dir ".") | ternary "" $dir -}}
-			{{- "\n" -}}
-		{{- end -}}
+		{{- $arch := .Architectures | first -}}
+		{{- $from := $.ArchDockerFrom $arch . -}}
+		git -C "$BASHBREW_CACHE/git" archive --format=tar
+		{{- " " -}}
+		{{- "--prefix=" -}}
+		{{- $.RepoName -}}
+		_
+		{{- .Tags | last -}}
+		{{- "/" -}}
+		{{- " " -}}
+		{{- .ArchGitCommit $arch -}}
+		{{- ":" -}}
+		{{- $dir := .ArchDirectory $arch -}}
+		{{- (eq $dir ".") | ternary "" $dir -}}
+		{{- "\n" -}}
 	{{- end -}}
 '