Merge pull request #268 from abs-tudelft/revert-267-abi-issues

Revert "Exclude fletchgen rpms for el7"
abs-tudelft · Jan 12, 2021 · c878fcc · c878fcc
2 parents 9a1439d + df68cdc
commit c878fcc
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/.github/workflows/assets.yml b/.github/workflows/assets.yml
@@ -19,11 +19,13 @@ jobs:
       matrix:
         source:
         - runtime/cpp
+        - codegen/cpp/fletchgen
     steps:
     - name: Install dependencies
       run: |
-        yum install -y epel-release https://repo.ius.io/ius-release-el7.rpm
-        yum install -y curl make gcc-c++ rpm-build git224
+        yum install -y epel-release centos-release-scl https://repo.ius.io/ius-release-el7.rpm
+        yum install -y curl make devtoolset-7-gcc-c++ rpm-build git224
+        echo "/opt/rh/devtoolset-7/root/bin/" >> $GITHUB_PATH
     - name: Install CMake
       run: curl -L https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-Linux-x86_64.tar.gz | tar xz --strip-components=1 -C /usr
     - name: Install Apache Arrow
@@ -63,28 +65,26 @@ jobs:
         source:
         - runtime/cpp
         - codegen/cpp/fletchgen
-        exclude:
-        - version: 7
-          source: codegen/cpp/fletchgen
     container: centos:${{ matrix.version }}
     steps:
     - name: Install dependencies
       run: |
         yum install -y epel-release
-        yum install -y curl make rpm-build gcc-c++
+        yum install -y curl make rpm-build
     - name: Install CMake
       run: curl -L https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-Linux-x86_64.tar.gz | tar xz --strip-components=1 -C /usr
     - name: Install Apache Arrow
       if: ${{ matrix.version == '7' }}
       run: |
-        yum install -y https://repo.ius.io/ius-release-el7.rpm
-        yum install -y git224
+        yum install -y https://repo.ius.io/ius-release-el7.rpm  centos-release-scl
+        yum install -y git224 devtoolset-7-gcc-c++
+        echo "/opt/rh/devtoolset-7/root/bin/" >> $GITHUB_PATH
         yum install -y https://apache.bintray.com/arrow/centos/$(cut -d: -f5 /etc/system-release-cpe)/apache-arrow-release-latest.rpm
         yum install -y arrow-devel-$ARROW_VERSION-1.el${{ matrix.version }}
     - name: Install Apache Arrow
       if: ${{ matrix.version == '8' }}
       run: |
-        dnf install -y git
+        dnf install -y git gcc-c++
         dnf install -y https://apache.bintray.com/arrow/centos/$(cut -d: -f5 /etc/system-release-cpe | cut -d. -f1)/apache-arrow-release-latest.rpm
         dnf config-manager --set-enabled epel || :
         dnf config-manager --set-enabled powertools || :