This is an automated email from the ASF dual-hosted git repository.
npr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 2c67e72f3a ARROW-16912: [R][CI] Fix nightly centos package without GCS
(#13441)
2c67e72f3a is described below
commit 2c67e72f3aa75029f277653c9c32af29c485721f
Author: Neal Richardson <[email protected]>
AuthorDate: Wed Jun 29 17:46:52 2022 -0400
ARROW-16912: [R][CI] Fix nightly centos package without GCS (#13441)
cc @assignUser
Most of the diff seems to be my editor trimming whitespace. The actual
changes:
* Rename `r-nightly-packages` to `r-binary-packages` since they can be run
on demand (not only nightly)
* Add it to the `r` crossbow group
* Turn ARROW_GCS=OFF in the centos-7 package. Where this setting happens is
not obvious.
Authored-by: Neal Richardson <[email protected]>
Signed-off-by: Neal Richardson <[email protected]>
---
.github/workflows/r_nightly.yml | 10 +++++-----
dev/tasks/r/github.packages.yml | 19 +++++++++----------
dev/tasks/tasks.yml | 5 +++--
docker-compose.yml | 14 ++++++++------
4 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/.github/workflows/r_nightly.yml b/.github/workflows/r_nightly.yml
index e4693a155f..9ee0968d85 100644
--- a/.github/workflows/r_nightly.yml
+++ b/.github/workflows/r_nightly.yml
@@ -17,7 +17,7 @@
name: Upload R Nightly builds
# This workflow downloads the (nightly) binaries created in crossbow and
uploads them
-# to nightlies.apache.org. Due to authorization requirements, this upload
can't be done
+# to nightlies.apache.org. Due to authorization requirements, this upload
can't be done
# from the crossbow repository.
@@ -51,7 +51,7 @@ jobs:
fetch-depth: 0
path: crossbow
repository: ursacomputing/crossbow
- ref: master
+ ref: master
- name: Set up Python
uses: actions/setup-python@v3
with:
@@ -70,7 +70,7 @@ jobs:
fi
echo $PREFIX
- archery crossbow download-artifacts -f r-nightly-packages -t
binaries $PREFIX
+ archery crossbow download-artifacts -f r-binary-packages -t binaries
$PREFIX
if [ -n "$(ls -A binaries/*/*/)" ]; then
echo "Found files!"
@@ -83,12 +83,12 @@ jobs:
run: |
# folder that we rsync to nightlies.apache.org
repo_root <- "repo"
- # The binaries are in a nested dir
+ # The binaries are in a nested dir
# so we need to find the correct path.
art_path <- list.files("binaries",
recursive = TRUE,
include.dirs = TRUE,
- pattern = "r-nightly-packages$",
+ pattern = "r-binary-packages$",
full.names = TRUE
)
diff --git a/dev/tasks/r/github.packages.yml b/dev/tasks/r/github.packages.yml
index 4f5caa0e1c..76beb6400c 100644
--- a/dev/tasks/r/github.packages.yml
+++ b/dev/tasks/r/github.packages.yml
@@ -18,7 +18,7 @@
{% import 'macros.jinja' as macros with context %}
# This allows us to set a custom version via param:
-# crossbow submit --param custom_version=8.5.3 r-nightly-packages
+# crossbow submit --param custom_version=8.5.3 r-binary-packages
# if the param is unset defaults to the usual Ymd naming scheme
{% set package_version = custom_version|default("\\2.\'\"$(date +%Y%m%d)\"\'")
%}
# We need this as boolean and string
@@ -44,7 +44,7 @@ jobs:
- name: Save Version
id: save-version
shell: bash
- run: |
+ run: |
echo "::set-output name=pkg_version::$(grep ^Version
arrow/r/DESCRIPTION | sed s/Version:\ //)"
- uses: r-lib/actions/setup-r@v2
@@ -99,7 +99,7 @@ jobs:
cd arrow/r/libarrow/dist
# These files were created by the docker user so we have to sudo to
get them
sudo -E zip -r $PKG_FILE lib/ include/
-
+
- name: Upload binary artifact
uses: actions/upload-artifact@v3
with:
@@ -131,7 +131,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: r-lib__libarrow__bin__windows
- path: build/arrow-*.zip
+ path: build/arrow-*.zip
r-packages:
needs: [source, windows-cpp]
@@ -158,7 +158,7 @@ jobs:
- name: Build Binary
id: build
shell: Rscript {0}
- env:
+ env:
ARROW_R_DEV: TRUE
run: |
on_windows <- tolower(Sys.info()[["sysname"]]) == "windows"
@@ -171,7 +171,7 @@ jobs:
cat("Remove old arrow version.\n")
remove.packages("arrow")
-
+
# Build
Sys.setenv(MAKEFLAGS = paste0("-j", parallel::detectCores()))
INSTALL_opts <- "--build"
@@ -195,7 +195,7 @@ jobs:
# encode contrib.url for artifact name
cmd <- paste0(
- "::set-output name=path::",
+ "::set-output name=path::",
gsub(
"/", "__",
contrib.url("", type = "binary")
@@ -287,9 +287,9 @@ jobs:
runs-on: ubuntu-latest
steps:
{{ macros.github_checkout_arrow()|indent }}
- - name: Download Artifacts
+ - name: Download Artifacts
uses: actions/download-artifact@v3
- with:
+ with:
path: artifacts
- name: Install R
uses: r-lib/actions/setup-r@v2
@@ -304,4 +304,3 @@ jobs:
file.copy(file.path("artifacts", file_paths), new_names)
{{ macros.github_upload_releases("binaries/r-*")|indent }}
-
\ No newline at end of file
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index 43dccba66e..8bc9dfafc3 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -87,6 +87,7 @@ groups:
- conda-linux-gcc-py*-cpu-r*
- conda-osx-clang-py*-r*
- conda-win-vs2017-py*-r*
+ - r-binary-packages
ruby:
- test-*ruby*
@@ -177,7 +178,7 @@ groups:
- nuget
- wheel-*
- python-sdist
- - r-nightly-packages
+ - r-binary-packages
nightly-release:
- verify-rc-source-*
@@ -931,7 +932,7 @@ tasks:
- Apache.Arrow.{no_rc_version}.snupkg
######################## R packages & binaries ##############################
- r-nightly-packages:
+ r-binary-packages:
ci: github
template: r/github.packages.yml
artifacts:
diff --git a/docker-compose.yml b/docker-compose.yml
index b23f88e4cc..1b65056aee 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -354,7 +354,7 @@ services:
- .:/arrow:delegated
- ${DOCKER_VOLUME_PREFIX}ubuntu-ccache:/ccache:delegated
command: *cpp-command
-
+
ubuntu-cpp-static:
# Usage:
# docker-compose build ubuntu-cpp-static
@@ -400,19 +400,21 @@ services:
cache_from:
- ${REPO}:centos-7-cpp-static
shm_size: *shm-size
- volumes:
+ volumes:
- .:/arrow:delegated
environment:
<<: *ccache
- ARROW_HOME: /arrow
ARROW_DEPENDENCY_SOURCE: BUNDLED
+ ARROW_HOME: /arrow
LIBARROW_MINIMAL: "false"
- ARROW_MIMALLOC: "ON"
+ # Turn off features that aren't supported on CentOS 7 gcc 4.8
+ ARROW_GCS: "OFF"
+ ARROW_MIMALLOC: "OFF"
+ ARROW_S3: "OFF"
command: >
/bin/bash -c "
- if grep -q -i -e 'centos.* 7' /etc/os-release; then export
ARROW_S3=OFF ARROW_MIMALLOC=OFF; fi &&
cd /arrow && r/inst/build_arrow_static.sh"
-
+
ubuntu-cpp-bundled:
# Arrow build with BUNDLED dependencies
image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cpp-minimal
