Skip to content

Commit

Permalink
Update container to manylinux_2_28
Browse files Browse the repository at this point in the history
  • Loading branch information
luismarques committed Sep 13, 2024
1 parent 482ead1 commit e514f7f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 41 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/toolchain_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ jobs:

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

steps:
Expand All @@ -54,7 +54,7 @@ jobs:
- name: Setup environment
run: |
echo ::group::Install dependencies
./prepare-centos-7.sh
./prepare-host.sh
echo ::endgroup::
echo ::group::Install crosstool-ng
Expand Down
2 changes: 1 addition & 1 deletion check-tarball.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ if [ -s "${broken_symlinks}" ]; then
fi

echo "Checking buidinfo.json"
if ! python -mjson.tool "${tarball_dest}/buildinfo.json"; then
if ! python3 -mjson.tool "${tarball_dest}/buildinfo.json"; then
echo "ERROR: buildinfo.json not valid json"
found_error=true
fi
Expand Down
7 changes: 3 additions & 4 deletions prepare-centos-7.sh → prepare-host.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ set -e
set -x

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

yum install -y \
dnf install -y \
sudo \
gh \
git \
Expand All @@ -23,9 +23,8 @@ yum install -y \
curl \
xz \
ncurses-devel \
ncurses-static \
pixman-devel \
rh-python36 \
python36 \
zlib-devel \
zlib-static \
libffi-devel
33 changes: 0 additions & 33 deletions prepare-ubuntu-20.04.sh

This file was deleted.

0 comments on commit e514f7f

Please sign in to comment.