Skip to content

Commit 5819341

Browse files
committed
Try to use the tag only when it exists.
1 parent 7f79efa commit 5819341

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

.github/workflows/build-manylinux-container-images.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,11 @@ jobs:
4545
# Build containers for ppc64
4646
# - ARCH: ppc64
4747
YEAR:
48-
- 2014
49-
- _2_24 # PEP 600
50-
- _2_28
48+
- VALUE: 2014
49+
TAG: 2025.01.19-2
50+
- VALUE: _2_24 # PEP 600
51+
- VALUE: _2_28
52+
TAG: 2025.01.19-2
5153
include:
5254
- IMAGE:
5355
ARCH: x86_64
@@ -61,12 +63,12 @@ jobs:
6163
env:
6264
LIBSSH_VERSION: 0.9.6
6365
PYPA_MANYLINUX_TAG: >-
64-
manylinux${{ matrix.YEAR }}_${{ matrix.IMAGE.ARCH }}
66+
manylinux${{ matrix.YEAR.VALUE }}_${{ matrix.IMAGE.ARCH }}
6567
FULL_IMAGE_NAME: >-
6668
${{
6769
github.repository
6870
}}-manylinux${{
69-
matrix.YEAR
71+
matrix.YEAR.VALUE
7072
}}_${{
7173
matrix.IMAGE.ARCH
7274
}}
@@ -108,6 +110,7 @@ jobs:
108110
build-args: |
109111
LIBSSH_VERSION=${{ env.LIBSSH_VERSION }}
110112
RELEASE=${{ env.PYPA_MANYLINUX_TAG }}
113+
TAG=${{ matrix.YEAR.TAG || 'latest' }}
111114
- name: Push to GitHub Container Registry
112115
if: >-
113116
(github.event_name == 'push' || github.event_name == 'schedule')

build-scripts/manylinux-container-image/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
ARG RELEASE
2-
FROM quay.io/pypa/${RELEASE}:2025.01.19-2
2+
ARG TAG
3+
FROM quay.io/pypa/${RELEASE}:${TAG}
34
ARG RELEASE
45
ARG LIBSSH_VERSION=0.9.6
56
MAINTAINER Python Cryptographic Authority

0 commit comments

Comments
 (0)