Skip to content

ARROW-5963: [R] R Appveyor job does not test changes in the C++ library #4900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nealrichardson wants to merge 8 commits into from
Closed

ARROW-5963: [R] R Appveyor job does not test changes in the C++ library #4900

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
214a4fe
Try building C++ lib from local git checkout
nealrichardson Jul 17, 2019
4fa5f70
Test only mine
nealrichardson Jul 17, 2019
ec8aebf
Try without checksum
nealrichardson Jul 17, 2019
eef10c6
Oops
nealrichardson Jul 17, 2019
f0bf364
Try this
nealrichardson Jul 17, 2019
ed14a37
Expand path
nealrichardson Jul 17, 2019
16b7e56
More playing with working directory
nealrichardson Jul 17, 2019
a87a8cf
Revert "Test only mine"
nealrichardson Jul 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions ci/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,34 +32,33 @@ depends=("${MINGW_PACKAGE_PREFIX}-boost"
makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-gcc")
options=("staticlibs" "strip" "!buildflags")
source_dir=apache-${_realname}-${pkgver}

# For installing from a local checkout, set source_dir to . and don't include
# a "source" param below
source_dir="$APPVEYOR_BUILD_FOLDER"
# else
# source_dir=apache-${_realname}-${pkgver}

# For released version:
#source=("https://archive.apache.org/dist/arrow/arrow-${pkgver}/apache-arrow-${pkgver}.tar.gz")
#sha256sums=("ac2a77dd9168e9892e432c474611e86ded0be6dfe15f689c948751d37f81391a")
# For github dev version:
# Append `#commit=54b1b2f688e5e84b4c664b1e12a95f93b94ab2f3` to the URL to select a revision
source=("${source_dir}"::"git+https://github.com/apache/arrow")
sha256sums=("SKIP")
# source=("${source_dir}"::"git+https://github.com/apache/arrow")
# sha256sums=("SKIP")
# source_dir="${APPVEYOR_BUILD_FOLDER}/${source_dir}"

cmake_build_type=release
cpp_build_dir=build-${CARCH}-cpp

pkgver() {
# The only purpose of this here is to cause the job to error if the
# version in pkgver is different from what is in r/DESCRIPTION
cd "$source_dir"
grep Version r/DESCRIPTION | cut -d " " -f 2
}

prepare() {
pushd ${source_dir}
#patch -p1 -N -i ${srcdir}/3923.patch
popd
grep Version "${source_dir}/r/DESCRIPTION" | cut -d " " -f 2
}

build() {
ARROW_CPP_DIR="$(pwd)/${source_dir}/cpp"
ARROW_CPP_DIR="${source_dir}/cpp"
[[ -d ${cpp_build_dir} ]] && rm -rf ${cpp_build_dir}
mkdir -p ${cpp_build_dir}
pushd ${cpp_build_dir}
Expand Down Expand Up @@ -104,12 +103,6 @@ build() {
popd
}

check() {
# TODO
# make -C ${cpp_build_dir} test
:
}

package() {
make -C ${cpp_build_dir} DESTDIR="${pkgdir}" install

Expand Down