Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add manylinux_2_28 support #533

Merged
merged 5 commits into from
Nov 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build-manylinux-container-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ jobs:
YEAR:
- 2014
- _2_24 # PEP 600
- _2_28
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the same tag is needed in the CI/CD workflow. This one only builds images, not the project itself.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, nevermind. #532 does that.

include:
- IMAGE:
ARCH: x86_64
Expand Down
21 changes: 15 additions & 6 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1318,21 +1318,30 @@ jobs:
strategy:
matrix:
target-container:
- tag: fedora:35
- tag: fedora:36
- tag: fedora:37
- tag: fedora:38
- tag: fedora:39
- tag: centos/centos:stream8
registry: quay.io
- tag: ubi8/ubi:8.3
registry: registry.access.redhat.com
- tag: ubi8/ubi:8.4
registry: registry.access.redhat.com
# No matching package to install: 'python3dist(wheel)'
# - tag: centos/centos:stream9
# registry: quay.io
- tag: ubi8/ubi:8.5
registry: registry.access.redhat.com
- tag: ubi8/ubi:8.6
registry: registry.access.redhat.com
- tag: ubi8/ubi:8.7
registry: registry.access.redhat.com
- tag: ubi8/ubi:8.8
registry: registry.access.redhat.com
- tag: ubi9/ubi:9.0.0
registry: registry.access.redhat.com
- tag: ubi9/ubi:9.1
registry: registry.access.redhat.com
- tag: ubi9/ubi:9.2
registry: registry.access.redhat.com
- tag: ubi9/ubi:9.3
registry: registry.access.redhat.com

runs-on: ubuntu-latest
container:
Expand Down
3 changes: 0 additions & 3 deletions build-scripts/manylinux-container-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ ARG LIBSSH_VERSION=0.9.6
MAINTAINER Python Cryptographic Authority
WORKDIR /root

ADD update-packages.sh /root/update-packages.sh
RUN ./update-packages.sh

ADD build_utils.sh /root/build_utils.sh
ADD install_perl.sh /root/install_perl.sh
RUN ./install_perl.sh "${RELEASE}"
Expand Down
19 changes: 0 additions & 19 deletions build-scripts/manylinux-container-image/update-packages.sh

This file was deleted.

1 change: 1 addition & 0 deletions docs/changelog-fragments/533.misc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Started building ``manylinux_2_28`` base images -- by :user:`Qalthos`
4 changes: 3 additions & 1 deletion requirements-build.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ wheel==0.37.1
# via -r -

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0
setuptools==59.6.0 ; python_version < "3.7"
setuptools==68.0.0 ; python_version == "3.7.*"
setuptools==68.2.2 ; python_version > "3.7"
# via
# -r -
# setuptools-scm