Skip to content

Commit

Permalink
Swap back to ArchDockerFroms instead of bashbrew fetch for more relia…
Browse files Browse the repository at this point in the history
…ble commit fetching
  • Loading branch information
yosifkit committed Dec 11, 2023
1 parent d4f0140 commit 886a25a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion diff-pr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ template='
{{- "\n" -}}
{{- range $.Entries -}}
{{- $arch := .HasArchitecture arch | ternary arch (.Architectures | first) -}}
{{- /* cannot replace ArchDockerFroms with bashbrew fetch or the arch selector logic has to be duplicated 🥹*/ -}}
{{- $froms := $.ArchDockerFroms $arch . -}}
{{- $outDir := join "_" $.RepoName (.Tags | last) -}}
git -C "{{ gitCache }}" archive --format=tar
{{- " " -}}
Expand Down Expand Up @@ -341,7 +343,6 @@ _metadata-files() {
| xargs -r bashbrew cat --format "$templateLastTags" 2>>temp/_bashbrew.err \
> temp/_bashbrew-list-build-order || :

bashbrew fetch --arch-filter "$@"
script="$(bashbrew cat --format "$template" "$@")"
mkdir tar
( eval "$script" | tar -xiC tar )
Expand Down

0 comments on commit 886a25a

Please sign in to comment.