Skip to content

Commit afad4ee

Browse files
authored
Merge pull request #269 from mbrobbel/abi-issues
Fix rpms
2 parents 0741926 + 524c0f6 commit afad4ee

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

.github/workflows/assets.yml

+9-11
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,18 @@ jobs:
1919
matrix:
2020
source:
2121
- runtime/cpp
22-
- codegen/cpp/fletchgen
2322
steps:
2423
- name: Install dependencies
2524
run: |
26-
yum install -y epel-release centos-release-scl https://repo.ius.io/ius-release-el7.rpm
27-
yum install -y curl make devtoolset-7-gcc-c++ rpm-build git224
28-
echo "/opt/rh/devtoolset-7/root/bin/" >> $GITHUB_PATH
25+
yum install -y epel-release
26+
yum install -y curl make gcc-c++ rpm-build git
2927
- name: Install CMake
3028
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
3129
- name: Install Apache Arrow
3230
run: |
3331
yum install -y https://apache.bintray.com/arrow/centos/$(cut -d: -f5 /etc/system-release-cpe)/apache-arrow-release-latest.rpm
3432
yum install -y arrow-devel-$ARROW_VERSION-1.el7
3533
- uses: actions/checkout@v2
36-
with:
37-
submodules: true
3834
- name: Configure
3935
run: cmake ${{ matrix.source }} -DCMAKE_BUILD_TYPE=Release
4036
- name: Package
@@ -65,35 +61,37 @@ jobs:
6561
source:
6662
- runtime/cpp
6763
- codegen/cpp/fletchgen
64+
exclude:
65+
- version: 7
66+
source: codegen/cpp/fletchgen
6867
container: centos:${{ matrix.version }}
6968
steps:
7069
- name: Install dependencies
7170
run: |
7271
yum install -y epel-release
73-
yum install -y curl make rpm-build
72+
yum install -y curl make rpm-build gcc-c++ git
7473
- name: Install CMake
7574
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
7675
- name: Install Apache Arrow
7776
if: ${{ matrix.version == '7' }}
7877
run: |
79-
yum install -y https://repo.ius.io/ius-release-el7.rpm centos-release-scl
80-
yum install -y git224 devtoolset-7-gcc-c++
81-
echo "/opt/rh/devtoolset-7/root/bin/" >> $GITHUB_PATH
8278
yum install -y https://apache.bintray.com/arrow/centos/$(cut -d: -f5 /etc/system-release-cpe)/apache-arrow-release-latest.rpm
8379
yum install -y arrow-devel-$ARROW_VERSION-1.el${{ matrix.version }}
8480
- name: Install Apache Arrow
8581
if: ${{ matrix.version == '8' }}
8682
run: |
87-
dnf install -y git gcc-c++
8883
dnf install -y https://apache.bintray.com/arrow/centos/$(cut -d: -f5 /etc/system-release-cpe | cut -d. -f1)/apache-arrow-release-latest.rpm
8984
dnf config-manager --set-enabled epel || :
9085
dnf config-manager --set-enabled powertools || :
9186
dnf config-manager --set-enabled codeready-builder-for-rhel-$(cut -d: -f5 /etc/system-release-cpe | cut -d. -f1)-rhui-rpms || :
9287
subscription-manager repos --enable codeready-builder-for-rhel-$(cut -d: -f5 /etc/system-release-cpe | cut -d. -f1)-$(arch)-rpms || :
9388
dnf install -y arrow-devel-$ARROW_VERSION-1.el${{ matrix.version }}
9489
- uses: actions/checkout@v2
90+
if: ${{ matrix.source == 'codegen/cpp/fletchgen' }}
9591
with:
9692
submodules: true
93+
- uses: actions/checkout@v2
94+
if: ${{ matrix.source != 'codegen/cpp/fletchgen' }}
9795
- name: Configure
9896
run: cmake ${{ matrix.source }} -DCMAKE_BUILD_TYPE=Release
9997
- name: Package

0 commit comments

Comments
 (0)