Skip to content

Commit c0d64a9

Browse files
authored
[CI] Replace git apply with overwriting in patching arrow.
1 parent 62c3e4e commit c0d64a9

5 files changed

Lines changed: 2640 additions & 126 deletions

File tree

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@ endif
132132

133133
.PHONY: build
134134
build: $(CORE_DEPS)
135-
WHEEL_ALIAS=$(HYBRIDBACKEND_WHEEL_ALIAS) \
136-
WHEEL_BUILD=$(HYBRIDBACKEND_WHEEL_BUILD) \
137-
WHEEL_REQUIRES=$(HYBRIDBACKEND_WHEEL_REQUIRES) \
135+
WHEEL_ALIAS="$(HYBRIDBACKEND_WHEEL_ALIAS)" \
136+
WHEEL_BUILD="$(HYBRIDBACKEND_WHEEL_BUILD)" \
137+
WHEEL_REQUIRES="$(HYBRIDBACKEND_WHEEL_REQUIRES)" \
138138
python setup.py bdist_wheel
139139
@ls dist/*.whl
140140

arrow/build.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
set -eo pipefail
44

5-
cd arrow/src
6-
git apply ../s3_enhancements.patch
7-
cd -
5+
cp -rf arrow/patches/cpp arrow/src/cpp
86

97
if [[ ! -d $CACHE_DIR ]]; then
108
CACHE_DIR=arrow/cache

0 commit comments

Comments
 (0)