Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: apache/incubator-gluten
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8d0a771ff4780bda587fba6ad02af90cf4189151
Choose a base ref
..
head repository: apache/incubator-gluten
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9de4b1034879699af358cb308df6bc8704569b9d
Choose a head ref
2 changes: 1 addition & 1 deletion .github/workflows/docker_image.yml
Original file line number Diff line number Diff line change
@@ -43,6 +43,6 @@ jobs:
uses: docker/build-push-action@v2
with:
context: .
file: dev/vcpkg/docker/Dockerfile.gha
file: dev/vcpkg/docker/gha-centos-7.dockerfile
push: true
tags: apache/gluten:vcpkg-centos-7
3 changes: 1 addition & 2 deletions .github/workflows/velox_docker.yml
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ concurrency:
jobs:
build-native-lib-centos-7:
runs-on: ubuntu-20.04
container: apache/gluten:gluten-vcpkg-builder_2024_08_05 # centos7 with dependencies installed
container: apache/gluten:vcpkg-centos-7
steps:
- uses: actions/checkout@v2
- name: Generate cache key
@@ -63,7 +63,6 @@ jobs:
with:
path: |
./cpp/build/releases/
/root/.m2/repository/org/apache/arrow/
key: cache-velox-build-centos-7-${{ hashFiles('./cache-key') }}
- name: Build Gluten native libraries
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
4 changes: 1 addition & 3 deletions .github/workflows/velox_docker_cache.yml
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ concurrency:
jobs:
cache-native-lib-centos-7:
runs-on: ubuntu-20.04
container: apache/gluten:gluten-vcpkg-builder_2024_08_05 # centos7 with dependencies installed
container: apache/gluten:vcpkg-centos-7
steps:
- uses: actions/checkout@v2
- name: Generate cache key
@@ -43,7 +43,6 @@ jobs:
lookup-only: true
path: |
./cpp/build/releases/
/root/.m2/repository/org/apache/arrow/
key: cache-velox-build-centos-7-${{ hashFiles('./cache-key') }}
- name: Build Gluten native libraries
if: steps.check-cache.outputs.cache-hit != 'true'
@@ -57,7 +56,6 @@ jobs:
with:
path: |
./cpp/build/releases/
/root/.m2/repository/org/apache/arrow/
key: cache-velox-build-centos-7-${{ hashFiles('./cache-key') }}

cache-native-lib-centos-8:
3 changes: 2 additions & 1 deletion dev/ci-velox-buildstatic-centos-7.sh
Original file line number Diff line number Diff line change
@@ -6,4 +6,5 @@ source /opt/rh/devtoolset-9/enable
cd $GITHUB_WORKSPACE/
source ./dev/vcpkg/env.sh
export NUM_THREADS=4
./dev/builddeps-veloxbe.sh --build_tests=OFF --build_benchmarks=OFF --enable_s3=ON --enable_gcs=ON --enable_hdfs=ON --enable_abfs=ON
./dev/builddeps-veloxbe.sh --build_tests=OFF --build_benchmarks=OFF --build_arrow=OFF --enable_s3=ON \
--enable_gcs=ON --enable_hdfs=ON --enable_abfs=ON
2 changes: 1 addition & 1 deletion dev/vcpkg/Makefile
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ docker-image:

docker-image-gha:
docker build \
--file docker/Dockerfile.gha \
--file docker/gha-centos-7.dockerfile \
--tag "$(DOCKER_IMAGE)" \
--build-arg HTTPS_PROXY="" \
--build-arg HTTP_PROXY="" \
Original file line number Diff line number Diff line change
@@ -25,4 +25,4 @@ ENV VCPKG_BINARY_SOURCES=clear;files,/var/cache/vcpkg,readwrite

# Build arrow, then install the native libs to system paths and jar package to .m2/ directory.
RUN cd /opt/gluten && source ./dev/vcpkg/env.sh && bash ./dev/builddeps-veloxbe.sh build_arrow && \
rm -rf ep/_ep/
rm -rf ep/_ep/ && rm -rf /tmp/velox-deps/