Skip to content

Commit

Permalink
[CI] Remove unnecessary source of devtoolset-7
Browse files Browse the repository at this point in the history
As packaging/wheel/install.sh will detect if the system is CentOS 7 and
then `source /opt/rh/devtoolset-7/enable` if so, there is no need to enable
devtoolset-7 in advance, so remove sourcing it from CI. With devtoolset-7
no longer providing a compiler to the environment at detection time in setup.py
also add gcc-c++ to the list of packages to install with yum.
  • Loading branch information
matthewfeickert committed Apr 28, 2022
1 parent b49c6e3 commit eca5686
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,6 @@ jobs:
- name: Build sdist using publishing workflow
run: |
. /opt/rh/devtoolset-7/enable
cp packaging/wheel/* .
./publish.sh
ls -lhtra dist/
Expand Down Expand Up @@ -559,6 +558,7 @@ jobs:
yum update -y
yum install --nogpg -y \
cmake3 \
gcc-c++ \
make \
krb5-devel \
libuuid-devel \
Expand All @@ -580,7 +580,6 @@ jobs:

- name: Build sdist using publishing workflow
run: |
. /opt/rh/devtoolset-7/enable
cp packaging/wheel/* .
./publish.sh
cd .. # Move xrootd.egg-info off PYTHONPATH
Expand All @@ -606,6 +605,7 @@ jobs:
yum update -y
yum install --nogpg -y \
cmake3 \
gcc-c++ \
make \
krb5-devel \
libuuid-devel \
Expand All @@ -627,7 +627,6 @@ jobs:

- name: Build sdist using publishing workflow
run: |
. /opt/rh/devtoolset-7/enable
cp packaging/wheel/* .
./publish.sh
cd .. # Move xrootd.egg-info off PYTHONPATH
Expand Down

0 comments on commit eca5686

Please sign in to comment.