Skip to content

Commit

Permalink
Adjust trixie to avoid too much riscv64
Browse files Browse the repository at this point in the history
Trixie doesn't yet have `git` (probably more), but `curl` does build successfully, so this adjusts `generate-stackbrew-library.sh` to exclude `riscv64` from all but `trixie-curl`.

```diff
$ diff -u <(bashbrew cat buildpack-deps) <(bashbrew cat <(./generate-stackbrew-library.sh))
--- /dev/fd/63	2024-08-13 10:59:42.728567215 -0700
+++ /dev/fd/62	2024-08-13 10:59:42.732567254 -0700
@@ -47,7 +47,7 @@
 Directory: debian/sid

 Tags: trixie-curl, testing-curl
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, riscv64, s390x
 GitCommit: 1f4fe49
 Directory: debian/trixie/curl

```
  • Loading branch information
tianon committed Aug 13, 2024
1 parent 2963e85 commit 790d59b
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions generate-stackbrew-library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,14 @@ for version; do
variantAliases=( "${variantAliases[@]//latest-/}" )

variantArches="$arches"
if [ "$version" = 'ubuntu/focal' ] && [ "$variant" != 'curl' ]; then
# focal on riscv64 doesn't have mercurial, so we just exclude the upper focal variants from riscv64 entirely
variantArches="$(sed -r -e 's/ riscv64 / /g' <<<" $variantArches ")"
fi
case "$version" in
debian/trixie)
# trixie on riscv64 doesn't have git yet (at the very least, probably more once we get past that one), so we just exclude the upper variants for now and can revisit later
if [ "$variant" != 'curl' ]; then
variantArches="$(sed -r -e 's/ riscv64 / /g' <<<" $variantArches ")"
fi
;;
esac

echo
cat <<-EOE
Expand Down

0 comments on commit 790d59b

Please sign in to comment.