Skip to content

Commit e514f7f

Browse files
committed
Update container to manylinux_2_28
1 parent 482ead1 commit e514f7f

File tree

4 files changed

+7
-41
lines changed

4 files changed

+7
-41
lines changed

.github/workflows/toolchain_build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ jobs:
4343

4444
name: ${{ matrix.display_name }}
4545
runs-on: ubuntu-latest
46-
# This is a CentOS 7 based image
47-
container: quay.io/pypa/manylinux2014_x86_64
46+
# This is an AlmaLinux 8 based image
47+
container: quay.io/pypa/manylinux_2_28_x86_64
4848
timeout-minutes: 360
4949

5050
steps:
@@ -54,7 +54,7 @@ jobs:
5454
- name: Setup environment
5555
run: |
5656
echo ::group::Install dependencies
57-
./prepare-centos-7.sh
57+
./prepare-host.sh
5858
echo ::endgroup::
5959
6060
echo ::group::Install crosstool-ng

check-tarball.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if [ -s "${broken_symlinks}" ]; then
4747
fi
4848

4949
echo "Checking buidinfo.json"
50-
if ! python -mjson.tool "${tarball_dest}/buildinfo.json"; then
50+
if ! python3 -mjson.tool "${tarball_dest}/buildinfo.json"; then
5151
echo "ERROR: buildinfo.json not valid json"
5252
found_error=true
5353
fi

prepare-centos-7.sh prepare-host.sh

+3-4
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ set -e
77
set -x
88

99
# Repository for the `gh` GitHub CLI tool used for creating releases.
10-
yum-config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo
10+
dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo
1111

12-
yum install -y \
12+
dnf install -y \
1313
sudo \
1414
gh \
1515
git \
@@ -23,9 +23,8 @@ yum install -y \
2323
curl \
2424
xz \
2525
ncurses-devel \
26-
ncurses-static \
2726
pixman-devel \
28-
rh-python36 \
27+
python36 \
2928
zlib-devel \
3029
zlib-static \
3130
libffi-devel

prepare-ubuntu-20.04.sh

-33
This file was deleted.

0 commit comments

Comments
 (0)