Skip to content

Commit

Permalink
Merge pull request #1230 from sys-bio/replace-manylinux2014-with-many…
Browse files Browse the repository at this point in the history
…linux_2_28-runner

Manylinux2014 is replaced with Manylinux_2_28 in C/CD workflow
  • Loading branch information
adelhpour authored Jul 5, 2024
2 parents eeea921 + 1ba0a6e commit e810608
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 106 deletions.
85 changes: 0 additions & 85 deletions .azurepipelines/getLLVM.py

This file was deleted.

41 changes: 20 additions & 21 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,20 @@ jobs:
os_name: windows-latest
build_type: Debug
build_python: OFF
- name: manylinux2014-release
- name: manylinux_2_28-release
os_type: manylinux
os_name: ubuntu-latest
container_image: quay.io/pypa/manylinux2014_x86_64
container_image: quay.io/pypa/manylinux_2_28_x86_64
build_type: Release
build_python: ON
libroadrunner_deps_owner: [ "sys-bio" ]
libroadrunner_deps_repo: [ "libroadrunner-deps" ]
libroadrunner_deps_name: [ "libroadrunner-deps" ]
libroadrunner_deps_release_version: [ "v2.1.1" ]
libroadrunner_deps_release_version: [ "v2.1.2" ]
llvm_owner: [ "sys-bio" ]
llvm_repo: [ "llvm-13.x" ]
llvm_name: [ "llvm-13.x" ]
llvm_release_version: [ "v13.0" ]
llvm_release_version: [ "v13.1" ]
build_tests: [ON]
build_plugins: [ON]
runs-on: ${{ matrix.platform.os_name }}
Expand All @@ -91,7 +91,7 @@ jobs:
- name: Checkout RoadRunner
if: matrix.platform.os_type == 'manylinux'
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Checkout RoadRunner
if: matrix.platform.os_type != 'manylinux'
Expand All @@ -112,7 +112,7 @@ jobs:
if: matrix.platform.build_python == 'ON' && matrix.platform.os_type == 'manylinux'
shell: bash
run: |
yum install -y wget
dnf install -y wget
wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh
bash Miniconda3-latest-Linux-x86_64.sh -b -p /Miniconda3
Expand Down Expand Up @@ -229,14 +229,13 @@ jobs:
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 90
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 90
elif [ "${{ matrix.platform.os_type }}" == 'manylinux' ]; then
yum install -y centos-release-scl
yum install -y devtoolset-11
scl enable devtoolset-11 bash
echo "/opt/rh/devtoolset-11/root/usr/bin" >> "${GITHUB_PATH}"
dnf install -y gcc-toolset-11
scl enable gcc-toolset-11 bash
echo "/opt/rh/gcc-toolset-11/root/usr/bin" >> "${GITHUB_PATH}"
fi
- name: Setup Ninja
uses: seanmiddleditch/gha-setup-ninja@v4
uses: seanmiddleditch/gha-setup-ninja@master

- name: Get Host Architecture
shell: bash
Expand Down Expand Up @@ -289,7 +288,7 @@ jobs:
- name: Cache ccache files on non-Windows
if: matrix.platform.os_type != 'windows'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${RUNNER_WORKSPACE}/.ccache
key:
Expand Down Expand Up @@ -324,7 +323,7 @@ jobs:
rm swig.zip
echo SWIG_DIR="-DSWIG_EXECUTABLE=${RUNNER_WORKSPACE}/swig/install-swig/swigwin-4.0.2/" >> "${GITHUB_PATH}"
elif [ "${{ matrix.platform.os_type }}" == 'manylinux' ]; then
yum install -y pcre-devel
dnf install -y pcre-devel
mkdir -p swig
cd swig
curl -L https://sourceforge.net/projects/swig/files/swig/swig-4.0.2/swig-4.0.2.tar.gz/download > swig.tar.gz
Expand Down Expand Up @@ -473,8 +472,8 @@ jobs:
mv libroadrunner*universal*.whl $(echo libroadrunner*universal*.whl | sed "s/universal2/${host_architecture}/g")
mv rrplugins*universal*.whl $(echo rrplugins*universal*.whl | sed "s/universal2/${host_architecture}/g")
elif compgen -G "*-linux*whl" > /dev/null; then
mv libroadrunner*-linux*.whl $(echo libroadrunner*-linux*.whl | sed "s/-linux/-manylinux2014/g")
mv rrplugins*-linux*.whl $(echo rrplugins*-linux*.whl | sed "s/-linux/-manylinux2014/g")
mv libroadrunner*-linux*.whl $(echo libroadrunner*-linux*.whl | sed "s/-linux/-manylinux_2_28/g")
mv rrplugins*-linux*.whl $(echo rrplugins*-linux*.whl | sed "s/-linux/-manylinux_2_28/g")
fi
mv * ${RUNNER_WORKSPACE}/wheels/
Expand Down Expand Up @@ -502,8 +501,8 @@ jobs:
mv libroadrunner*universal*.whl $(echo libroadrunner*universal*.whl | sed "s/universal2/${host_architecture}/g")
mv rrplugins*universal*.whl $(echo rrplugins*universal*.whl | sed "s/universal2/${host_architecture}/g")
elif compgen -G "*-linux*whl" > /dev/null; then
mv libroadrunner*-linux*.whl $(echo libroadrunner*-linux*.whl | sed "s/-linux/-manylinux2014/g")
mv rrplugins*-linux*.whl $(echo rrplugins*-linux*.whl | sed "s/-linux/-manylinux2014/g")
mv libroadrunner*-linux*.whl $(echo libroadrunner*-linux*.whl | sed "s/-linux/-manylinux_2_28/g")
mv rrplugins*-linux*.whl $(echo rrplugins*-linux*.whl | sed "s/-linux/-manylinux_2_28/g")
fi
mv * ${RUNNER_WORKSPACE}/wheels/
Expand Down Expand Up @@ -532,8 +531,8 @@ jobs:
mv libroadrunner*universal*.whl $(echo libroadrunner*universal*.whl | sed "s/universal2/${host_architecture}/g")
mv rrplugins*universal*.whl $(echo rrplugins*universal*.whl | sed "s/universal2/${host_architecture}/g")
elif compgen -G "*-linux*whl" > /dev/null; then
mv libroadrunner*-linux*.whl $(echo libroadrunner*-linux*.whl | sed "s/-linux/-manylinux2014/g")
mv rrplugins*-linux*.whl $(echo rrplugins*-linux*.whl | sed "s/-linux/-manylinux2014/g")
mv libroadrunner*-linux*.whl $(echo libroadrunner*-linux*.whl | sed "s/-linux/-manylinux_2_28/g")
mv rrplugins*-linux*.whl $(echo rrplugins*-linux*.whl | sed "s/-linux/-manylinux_2_28/g")
fi
mv * ${RUNNER_WORKSPACE}/wheels/
Expand Down Expand Up @@ -572,8 +571,8 @@ jobs:
mv libroadrunner*universal*.whl $(echo libroadrunner*universal*.whl | sed "s/universal2/${host_architecture}/g")
mv rrplugins*universal*.whl $(echo rrplugins*universal*.whl | sed "s/universal2/${host_architecture}/g")
elif compgen -G "*-linux*whl" > /dev/null; then
mv libroadrunner*-linux*.whl $(echo libroadrunner*-linux*.whl | sed "s/-linux/-manylinux2014/g")
mv rrplugins*-linux*.whl $(echo rrplugins*-linux*.whl | sed "s/-linux/-manylinux2014/g")
mv libroadrunner*-linux*.whl $(echo libroadrunner*-linux*.whl | sed "s/-linux/-manylinux_2_28/g")
mv rrplugins*-linux*.whl $(echo rrplugins*-linux*.whl | sed "s/-linux/-manylinux_2_28/g")
fi
mv * ${RUNNER_WORKSPACE}/wheels/
Expand Down

0 comments on commit e810608

Please sign in to comment.