Skip to content

Commit 7c7b7cb

Browse files
committed
Remove more CentOS 7 related code
1 parent 13dcda7 commit 7c7b7cb

File tree

4 files changed

+7
-131
lines changed

4 files changed

+7
-131
lines changed

ci/docker/centos-7-cpp.dockerfile

Lines changed: 0 additions & 60 deletions
This file was deleted.

compose.yaml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ x-hierarchy:
114114
# service entry, so any new image/service must be listed here.
115115
- almalinux-verify-rc
116116
- alpine-linux-cpp
117-
- centos-cpp-static
118117
- conda:
119118
- conda-cpp:
120119
- conda-integration
@@ -447,26 +446,6 @@ services:
447446
cd /arrow &&
448447
r/inst/build_arrow_static.sh"
449448

450-
centos-cpp-static:
451-
image: ${REPO}:centos-7-cpp-static
452-
build:
453-
context: .
454-
dockerfile: ci/docker/centos-7-cpp.dockerfile
455-
cache_from:
456-
- ${REPO}:centos-7-cpp-static
457-
args:
458-
cmake: ${CMAKE}
459-
shm_size: *shm-size
460-
volumes:
461-
- .:/arrow:delegated
462-
environment:
463-
<<: [*common, *ccache, *sccache, *cpp]
464-
ARROW_DEPENDENCY_SOURCE: BUNDLED
465-
ARROW_HOME: /arrow
466-
LIBARROW_MINIMAL: "false"
467-
command: /bin/bash -c "
468-
scl enable devtoolset-8 '/arrow/r/inst/build_arrow_static.sh'"
469-
470449
ubuntu-cpp-bundled:
471450
# Arrow build with BUNDLED dependencies
472451
image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cpp-minimal

dev/tasks/r/github.packages.yml

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@ jobs:
303303
with:
304304
name: r-pkg{{ '${{ steps.build.outputs.path }}' }}
305305
path: arrow_*
306+
306307
test-linux-binary:
307308
needs: [source, linux-cpp]
308309
name: Test binary {{ '${{ matrix.config.image }}' }}
@@ -352,40 +353,6 @@ jobs:
352353
Rscript -e '
353354
{{ macros.github_test_r_src_pkg()|indent(8) }}
354355
'
355-
- name: Upload binary artifact
356-
if: matrix.config.devtoolset
357-
uses: actions/upload-artifact@v4
358-
with:
359-
name: r-pkg_centos7
360-
path: arrow_*
361-
362-
test-centos-binary:
363-
# arrow binary package not on ppm currently see #37922
364-
if: false
365-
needs: test-linux-binary
366-
runs-on: ubuntu-latest
367-
container: "rstudio/r-base:4.2-centos7"
368-
steps:
369-
- uses: actions/download-artifact@v4
370-
with:
371-
name: r-pkg_centos7
372-
- name: Install DTS Package
373-
shell: Rscript {0}
374-
run: |
375-
pkg <- list.files(pattern = "arrow_*")
376-
if(length(pkg) > 1) {
377-
pkg <- pkg[[1]]
378-
warning("Multiple packages found! Using first one.")
379-
}
380-
381-
# Install dependencies from RSPM
382-
install.packages("arrow", repos = "https://packagemanager.rstudio.com/all/__linux__/centos7/latest")
383-
remove.packages("arrow")
384-
385-
install.packages(pkg)
386-
library(arrow)
387-
read_parquet(system.file("v0.7.1.parquet", package = "arrow"))
388-
print(arrow_info())
389356
390357
test-source:
391358
needs: source

r/configure

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -214,22 +214,12 @@ do_bundled_build () {
214214
if [ "${PKG_CONFIG_AVAILABLE}" = "true" ]; then
215215
# Use pkg-config to do static linking of libarrow's dependencies
216216
export PKG_CONFIG_PATH="${LIB_DIR}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}"
217-
# pkg-config on CentOS 7 doesn't have --define-prefix option.
218-
if ${PKG_CONFIG} --help | grep -- --define-prefix >/dev/null 2>&1; then
219-
# --define-prefix is for binary packages. Binary packages
220-
# uses "/arrow/r/libarrow/dist" as prefix but it doesn't
221-
# match the extracted path. --define-prefix uses a directory
222-
# that arrow.pc exists as its prefix instead of
223-
# "/arrow/r/libarrow/dist".
224-
PKG_CONFIG="${PKG_CONFIG} --define-prefix"
225-
else
226-
# Rewrite prefix= in arrow.pc on CentOS 7.
227-
sed \
228-
-i.bak \
229-
-e "s,prefix=/arrow/r/libarrow/dist,prefix=${LIB_DIR}/..,g" \
230-
${LIB_DIR}/pkgconfig/*.pc
231-
rm -f ${LIB_DIR}/pkgconfig/*.pc.bak
232-
fi
217+
# --define-prefix is for binary packages. Binary packages
218+
# uses "/arrow/r/libarrow/dist" as prefix but it doesn't
219+
# match the extracted path. --define-prefix uses a directory
220+
# that arrow.pc exists as its prefix instead of
221+
# "/arrow/r/libarrow/dist".
222+
PKG_CONFIG="${PKG_CONFIG} --define-prefix"
233223
fi
234224
else
235225
# If the library directory does not exist, the script must not have been successful

0 commit comments

Comments
 (0)