Merge pull request #43 from curl/fix-ci-jobs

Fix ci jobs
curl · Nov 28, 2023 · 28129f8 · 28129f8
2 parents 7d7540f + 70a0c5a
commit 28129f8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/create_dev_image.sh b/create_dev_image.sh
@@ -76,7 +76,7 @@ else
 fi
 
 # build curl
-buildah run $bdr autoreconf -vif
+buildah run $bdr autoreconf -fi
 buildah run $bdr ./configure ${build_opts}
 buildah run $bdr make -j$(nproc)
 

diff --git a/create_multi.sh b/create_multi.sh
@@ -24,8 +24,7 @@ buildah manifest create curl-base-multi:${release_tag}
 buildah manifest create curl-multi:${release_tag}
 
 # loop through supported arches
-# TODO: need to add back "linux/arm/v7"
-for IMGTAG in "linux/amd64" "linux/arm64" "linux/ppc64le" "linux/s390x" "linux/386" ; do
+for IMGTAG in "linux/386" "linux/arm/v7" "linux/amd64" "linux/arm64" "linux/ppc64le" ; do
   pathname="${IMGTAG////-}"
   echo "building $IMGTAG : $pathname"
  	./create_dev_image.sh "$IMGTAG" ${base} ${compiler} "$dev_deps" "$build_opts" ${branch_or_ref} curl-dev-${pathname}:${release_tag} 0