From ac1d467b4d25bfbe49e85ccd3d5e9105617674a4 Mon Sep 17 00:00:00 2001
From: Matthijs Brobbel <m1brobbel@gmail.com>
Date: Thu, 14 Jan 2021 16:21:14 +0100
Subject: [PATCH 1/2] Skip fletchgen assets for centos 7

---
 .github/workflows/assets.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/assets.yml b/.github/workflows/assets.yml
index 5221d278..1b89f2be 100644
--- a/.github/workflows/assets.yml
+++ b/.github/workflows/assets.yml
@@ -19,13 +19,11 @@ 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
@@ -33,8 +31,6 @@ jobs:
         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,26 +61,25 @@ 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-g++ 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 || :
@@ -92,8 +87,11 @@ jobs:
         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

From 524c0f654596752743a8db43c7841bb10273ea5a Mon Sep 17 00:00:00 2001
From: Matthijs Brobbel <m1brobbel@gmail.com>
Date: Thu, 14 Jan 2021 16:25:10 +0100
Subject: [PATCH 2/2] Fix a typo

---
 .github/workflows/assets.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/assets.yml b/.github/workflows/assets.yml
index 1b89f2be..db82d334 100644
--- a/.github/workflows/assets.yml
+++ b/.github/workflows/assets.yml
@@ -69,7 +69,7 @@ jobs:
     - name: Install dependencies
       run: |
         yum install -y epel-release
-        yum install -y curl make rpm-build gcc-g++ git
+        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