Merge pull request #269 from mbrobbel/abi-issues

Fix rpms
abs-tudelft · Jan 14, 2021 · afad4ee · afad4ee
2 parents 0741926 + 524c0f6
commit afad4ee
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/.github/workflows/assets.yml b/.github/workflows/assets.yml
@@ -19,22 +19,18 @@ jobs:
       matrix:
         source:
         - runtime/cpp
-        - codegen/cpp/fletchgen
     steps:
     - name: Install dependencies
       run: |
-        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
+        yum install -y epel-release
+        yum install -y curl make gcc-c++ rpm-build git
     - 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
       run: |
         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.el7
     - uses: actions/checkout@v2
-      with:
-        submodules: true
     - name: Configure
       run: cmake ${{ matrix.source }} -DCMAKE_BUILD_TYPE=Release
     - name: Package
@@ -65,35 +61,37 @@ 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
+        yum install -y curl make rpm-build gcc-c++ git
     - 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  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 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 || :
         dnf config-manager --set-enabled codeready-builder-for-rhel-$(cut -d: -f5 /etc/system-release-cpe | cut -d. -f1)-rhui-rpms || :
         subscription-manager repos --enable codeready-builder-for-rhel-$(cut -d: -f5 /etc/system-release-cpe | cut -d. -f1)-$(arch)-rpms || :
         dnf install -y arrow-devel-$ARROW_VERSION-1.el${{ matrix.version }}
     - uses: actions/checkout@v2
+      if: ${{ matrix.source == 'codegen/cpp/fletchgen' }}
       with:
         submodules: true
+    - uses: actions/checkout@v2
+      if: ${{ matrix.source != 'codegen/cpp/fletchgen' }}
     - name: Configure
       run: cmake ${{ matrix.source }} -DCMAKE_BUILD_TYPE=Release
     - name: Package