diff --git a/.github/workflows/toolchain_build.yml b/.github/workflows/toolchain_build.yml index b5901b9..18b037e 100644 --- a/.github/workflows/toolchain_build.yml +++ b/.github/workflows/toolchain_build.yml @@ -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: @@ -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 diff --git a/check-tarball.sh b/check-tarball.sh index 17c3e90..a7a672e 100755 --- a/check-tarball.sh +++ b/check-tarball.sh @@ -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 diff --git a/prepare-centos-7.sh b/prepare-host.sh similarity index 79% rename from prepare-centos-7.sh rename to prepare-host.sh index 9c7c72b..04af077 100755 --- a/prepare-centos-7.sh +++ b/prepare-host.sh @@ -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 \ @@ -23,9 +23,8 @@ yum install -y \ curl \ xz \ ncurses-devel \ - ncurses-static \ pixman-devel \ - rh-python36 \ + python36 \ zlib-devel \ zlib-static \ libffi-devel diff --git a/prepare-ubuntu-20.04.sh b/prepare-ubuntu-20.04.sh deleted file mode 100755 index 636ab5f..0000000 --- a/prepare-ubuntu-20.04.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -# Copyright lowRISC contributors. -# Licensed under the Apache License, Version 2.0, see LICENSE for details. -# SPDX-License-Identifier: Apache-2.0 - -set -e -set -x - -# Install prerequisite packages. -# -# Notes: -# - liblzma-dev is removed to prevent it being dynamically linked to GDB. -# - libxml2-dev is removed to prevent it being dynamically linked to LD. -sudo apt install -y \ - bison \ - curl \ - flex \ - gawk \ - gettext \ - git \ - help2man \ - libffi-dev \ - libncurses-dev \ - libpixman-1-dev \ - libtool-bin \ - texinfo \ - xz-utils \ - zlib1g \ - zlib1g-dev - -sudo apt remove -y \ - liblzma-dev \ - libxml2-dev