Skip to content

Commit c1ce95b

Browse files
authored
Merge pull request #1791 from mayeut/multiarch-rework
chore: update cosign to 2.5.0 & rework multi-arch deploy
2 parents 796e87b + 6299f9c commit c1ce95b

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

deploy_multiarch.sh

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ IMAGES=(manylinux2014 manylinux_2_28 manylinux_2_31 manylinux_2_34 musllinux_1_2
77
podman login -u "${QUAY_USERNAME}" -p "${QUAY_PASSWORD}" quay.io
88

99
for IMAGE in "${IMAGES[@]}"; do
10-
echo "::group::${IMAGE}"
11-
LAST_TAG="$(oras repo tags --last "2025.02.23-1" "quay.io/pypa/${IMAGE}" | tail -2 | head -1)"
10+
echo "::group::${IMAGE} check"
11+
LAST_TAG="$(oras repo tags --last "2025.06.08-1" "quay.io/pypa/${IMAGE}" | tail -2 | head -1)"
1212
if [ "${LAST_TAG}" == "" ]; then
13-
LAST_TAG=2025.02.23-1
13+
LAST_TAG=2025.06.08-1
1414
fi
15-
echo "${IMAGE}: last tag is ${LAST_TAG}"
15+
echo "last tag is ${LAST_TAG}"
1616
case ${IMAGE} in
1717
manylinux_2_31) REF_IMAGE=manylinux_2_31_armv7l;;
1818
*) REF_IMAGE=${IMAGE}_x86_64;;
@@ -22,12 +22,14 @@ for IMAGE in "${IMAGES[@]}"; do
2222
TAGS_TO_PUSH+=("$LINE");
2323
done < <(oras repo tags --last "${LAST_TAG}" "quay.io/pypa/${REF_IMAGE}" | grep -v "^20[0-9][0-9]-" | grep -v "latest")
2424
if [ ${#TAGS_TO_PUSH[@]} -eq 0 ]; then
25-
echo "${IMAGE}: up-to-date"
25+
echo "no new tags to push"
2626
echo "::endgroup::"
2727
continue
2828
fi
29+
echo "pushing tags ${TAGS_TO_PUSH[*]}"
30+
# no nested groups in GHA
31+
echo "::endgroup::"
2932

30-
echo "${IMAGE}: adding tags ${TAGS_TO_PUSH[*]}"
3133
case ${IMAGE} in
3234
manylinux_2_31) ARCHS=("armv7l");;
3335
manylinux2014) ARCHS=("x86_64" "i686" "aarch64" "ppc64le" "s390x");;
@@ -37,7 +39,7 @@ for IMAGE in "${IMAGES[@]}"; do
3739

3840
LATEST_MANIFEST=
3941
for TAG_TO_PUSH in "${TAGS_TO_PUSH[@]}"; do
40-
echo "::group::${TAG_TO_PUSH}"
42+
echo "::group::${IMAGE}:${TAG_TO_PUSH}"
4143
SRC_IMAGES=()
4244
for ARCH in "${ARCHS[@]}"; do
4345
SRC_IMAGES+=("docker://quay.io/pypa/${IMAGE}_${ARCH}:${TAG_TO_PUSH}")
@@ -54,6 +56,8 @@ for IMAGE in "${IMAGES[@]}"; do
5456
fi
5557
echo "::endgroup::"
5658
done
59+
60+
echo "::group::${IMAGE}:latest"
5761
if [ "${LATEST_MANIFEST}" == "" ]; then
5862
echo "::warning ::${IMAGE}: skipping latest due to previous errors"
5963
else

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ RUN export MPDECIMAL_ROOT=mpdecimal-4.0.0 && \
107107
manylinux-entrypoint /build_scripts/build-mpdecimal.sh
108108

109109

110-
FROM --platform=${BUILDPLATFORM} ghcr.io/sigstore/cosign/cosign:v2.4.2 AS cosign-bin
110+
FROM --platform=${BUILDPLATFORM} ghcr.io/sigstore/cosign/cosign:v2.5.0 AS cosign-bin
111111

112112
FROM build_base AS build_cpython
113113
COPY --from=build_tcl_tk /manylinux-buildfs /

0 commit comments

Comments
 (0)