Skip to content

ARROW-10178: [CI] Remove patch to fix Spark master build #8352

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
BryanCutler wants to merge 3 commits into from
Closed

ARROW-10178: [CI] Remove patch to fix Spark master build #8352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c62c5b
Remove patch to fix Spark master build
BryanCutler Oct 5, 2020
ed31bb2
Add Spark patch to correct nested timestamps
BryanCutler Oct 6, 2020
6a064e5
Revert "Add Spark patch to correct nested timestamps"
BryanCutler Oct 7, 2020
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
4 changes: 0 additions & 4 deletions ci/docker/conda-python-spark.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ ARG spark=master
COPY ci/scripts/install_spark.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_spark.sh ${spark} /spark

# patch spark to build with current Arrow Java
COPY ci/etc/integration_spark_ARROW-9438.patch /arrow/ci/etc/
RUN patch -d /spark -p1 -i /arrow/ci/etc/integration_spark_ARROW-9438.patch

# build cpp with tests
ENV CC=gcc \
CXX=g++ \
Expand Down
72 changes: 0 additions & 72 deletions ci/etc/integration_spark_ARROW-9438.patch
View file
Open in desktop

This file was deleted.