Skip to content

Commit 6e50d96

Browse files
committed
Cleanup. Try build with centos7 clang7
1 parent 9ddd7bc commit 6e50d96

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ jobs:
158158
yum -y install epel-release dnf-plugins-core sudo
159159
yum config-manager --set-enabled powertools
160160
yum -y install gcc-toolset-${{ matrix.version }}-gcc-c++
161-
source /opt/rh/gcc-toolset-${{ matrix.version }}/enable
162161
- name: Install and Test
163162
run: (source /opt/rh/gcc-toolset-${{ matrix.version }}/enable && ./install.sh && make tests)
164163

@@ -179,13 +178,12 @@ jobs:
179178
run: |
180179
yum -y install centos-release-scl epel-release sudo
181180
yum -y install devtoolset-${{ matrix.version }}
182-
source /opt/rh/devtoolset-${{ matrix.version }}/enable
183181
- name: Install and Test
184182
run: (source /opt/rh/devtoolset-${{ matrix.version }}/enable && ./install.sh && make tests)
185183

186184
build-external-centos7-clang:
187185
timeout-minutes: 10
188-
name: Build in GCC
186+
name: Build in Clang
189187
runs-on: ubuntu-20.04
190188
container:
191189
image: ${{ matrix.container }}
@@ -200,11 +198,10 @@ jobs:
200198
run: |
201199
yum -y install centos-release-scl epel-release sudo
202200
yum -y install llvm-toolset-7.0-clang.x86_64
203-
scl enable llvm-toolset-${{ matrix.version }}.0 bash
204-
echo "CC=clang" >> $GITHUB_ENV
205-
echo "CXX=clang++" >> $GITHUB_ENV
201+
echo "CC=clang-${{ matrix.version }}" >> $GITHUB_ENV
202+
echo "CXX=clang++-${{ matrix.version }}" >> $GITHUB_ENV
206203
- name: Install and Test
207-
run: (scl enable llvm-toolset-${{ matrix.version }}.0 bash && ./install.sh && make tests)
204+
run: (source /opt/rh/llvm-toolset-${{ matrix.version }}.0/enable && ./install.sh && make tests)
208205

209206
build-mac-gcc:
210207
timeout-minutes: 10

0 commit comments

Comments
 (0)