From 1316894a3de32761bef1ff9275acce2598e41580 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Thu, 14 Nov 2019 19:27:57 -0800 Subject: [PATCH 1/2] Only mine (revert me) --- appveyor.yml | 54 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 65b44e5493394..1b95192acfd40 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -62,34 +62,34 @@ environment: matrix: # NOTE: clcache seems to work best with Ninja and worst with msbuild # (as generated by cmake) - - JOB: "Build" - GENERATOR: Ninja - CONFIGURATION: "Release" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - - JOB: "Toolchain" - GENERATOR: Ninja - CONFIGURATION: "Release" - ARROW_S3: "ON" - ARROW_BUILD_FLIGHT: "ON" - ARROW_BUILD_GANDIVA: "ON" - # NOTE: Since ARROW-5403 we have disabled the static CRT build - # - JOB: "Static_Crt_Build" + # - JOB: "Build" # GENERATOR: Ninja - - JOB: "Build_Debug" - GENERATOR: Ninja - CONFIGURATION: "Debug" - - JOB: "MinGW32" - MINGW_ARCH: i686 - MINGW_PACKAGE_PREFIX: mingw-w64-i686 - MINGW_PREFIX: c:\msys64\mingw32 - MSYSTEM: MINGW32 - USE_CLCACHE: false - - JOB: "MinGW64" - MINGW_ARCH: x86_64 - MINGW_PACKAGE_PREFIX: mingw-w64-x86_64 - MINGW_PREFIX: c:\msys64\mingw64 - MSYSTEM: MINGW64 - USE_CLCACHE: false + # CONFIGURATION: "Release" + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + # - JOB: "Toolchain" + # GENERATOR: Ninja + # CONFIGURATION: "Release" + # ARROW_S3: "ON" + # ARROW_BUILD_FLIGHT: "ON" + # ARROW_BUILD_GANDIVA: "ON" + # # NOTE: Since ARROW-5403 we have disabled the static CRT build + # # - JOB: "Static_Crt_Build" + # # GENERATOR: Ninja + # - JOB: "Build_Debug" + # GENERATOR: Ninja + # CONFIGURATION: "Debug" + # - JOB: "MinGW32" + # MINGW_ARCH: i686 + # MINGW_PACKAGE_PREFIX: mingw-w64-i686 + # MINGW_PREFIX: c:\msys64\mingw32 + # MSYSTEM: MINGW32 + # USE_CLCACHE: false + # - JOB: "MinGW64" + # MINGW_ARCH: x86_64 + # MINGW_PACKAGE_PREFIX: mingw-w64-x86_64 + # MINGW_PREFIX: c:\msys64\mingw64 + # MSYSTEM: MINGW64 + # USE_CLCACHE: false - JOB: "R with libarrow" USE_CLCACHE: false TEST_R_WITH_ARROW: "TRUE" From 57fcb569ddf48830c46c4df42b81abcb0223582b Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Thu, 14 Nov 2019 19:33:24 -0800 Subject: [PATCH 2/2] Gather some intelligence --- ci/PKGBUILD | 9 +++++++++ ci/appveyor-build-r.sh | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ci/PKGBUILD b/ci/PKGBUILD index 7eb0598b5dd27..079cf43f6f754 100644 --- a/ci/PKGBUILD +++ b/ci/PKGBUILD @@ -85,12 +85,21 @@ build() { -DARROW_JEMALLOC=OFF \ -DARROW_WITH_ZLIB=ON \ -DARROW_WITH_SNAPPY=ON \ + -DARROW_WITH_URIPARSER=ON \ -DARROW_USE_GLOG=OFF \ -DARROW_BUILD_UTILITIES=OFF \ -Ddouble-conversion_ROOT="${MINGW_PREFIX}" \ -DThrift_ROOT="${MINGW_PREFIX}" make + echo "MINGW_PREFIX" + echo ${MINGW_PREFIX} + ls ${MINGW_PREFIX} + ls ${MINGW_PREFIX}/lib + echo "cwd" + ls + ls uriparser_ep-install + ls uriparser_ep-install/lib popd } diff --git a/ci/appveyor-build-r.sh b/ci/appveyor-build-r.sh index 1dfdea8792f97..710564d1a46a5 100644 --- a/ci/appveyor-build-r.sh +++ b/ci/appveyor-build-r.sh @@ -40,7 +40,7 @@ export PKG_CONFIG="/${MINGW_INSTALLS}/bin/pkg-config --static" cd $APPVEYOR_BUILD_FOLDER cp ci/PKGBUILD . -makepkg-mingw --noconfirm --noprogressbar --skippgpcheck --nocheck --syncdeps --rmdeps --cleanbuild +makepkg-mingw --noconfirm --noprogressbar --skippgpcheck --nocheck --syncdeps --cleanbuild # Collect the build artifacts and make the shape of zip file that rwinlib expects mkdir build