Skip to content

Commit df4c6b6

Browse files
committed
Try to use the tag only when it exists.
1 parent c4e2812 commit df4c6b6

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

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

+13-8
Original file line numberDiff line numberDiff line change
@@ -45,28 +45,32 @@ 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
5456
QEMU_ARCH: amd64
55-
YEAR: 1
57+
YEAR:
58+
VALUE: 1
5659
- IMAGE:
5760
ARCH: x86_64
5861
QEMU_ARCH: amd64
59-
YEAR: 2010
62+
YEAR:
63+
VALUE: 2010
6064

6165
env:
6266
LIBSSH_VERSION: 0.9.6
6367
PYPA_MANYLINUX_TAG: >-
64-
manylinux${{ matrix.YEAR }}_${{ matrix.IMAGE.ARCH }}
68+
manylinux${{ matrix.YEAR.VALUE }}_${{ matrix.IMAGE.ARCH }}
6569
FULL_IMAGE_NAME: >-
6670
${{
6771
github.repository
6872
}}-manylinux${{
69-
matrix.YEAR
73+
matrix.YEAR.VALUE
7074
}}_${{
7175
matrix.IMAGE.ARCH
7276
}}
@@ -78,7 +82,7 @@ jobs:
7882

7983
name: >- # can't use `env` in this context:
8084
🐳
81-
manylinux${{ matrix.YEAR }}_${{ matrix.IMAGE.ARCH }}
85+
manylinux${{ matrix.YEAR.VALUE }}_${{ matrix.IMAGE.ARCH }}
8286
steps:
8387
- name: Fetch the repo src
8488
uses: actions/checkout@v4.1.6
@@ -108,6 +112,7 @@ jobs:
108112
build-args: |
109113
LIBSSH_VERSION=${{ env.LIBSSH_VERSION }}
110114
RELEASE=${{ env.PYPA_MANYLINUX_TAG }}
115+
TAG=${{ matrix.YEAR.TAG || 'latest' }}
111116
- name: Push to GitHub Container Registry
112117
if: >-
113118
(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)