Skip to content

Commit

Permalink
one more approach
Browse files Browse the repository at this point in the history
  • Loading branch information
paleolimbot committed Jun 6, 2024
1 parent 7ea2ce0 commit 54b149e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 14 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ jobs:
env:
ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
ARCHERY_INTEGRATION_WITH_NANOARROW: "1"
ARCHERY_INTEGRATION_WITH_RUST: "1"
run: >
archery docker run \
-e ARCHERY_DEFAULT_BRANCH=${{ github.event.repository.default_branch }} \
Expand Down
8 changes: 3 additions & 5 deletions ci/scripts/nanoarrow_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,14 @@ build_dir=${2}/nanoarrow

if [ "${ARCHERY_INTEGRATION_WITH_NANOARROW}" -eq "0" ]; then
echo "====================================================================="
echo "Not building nanoarrow"
echo "Not building nanoarrow because ARCHERY_INTEGRATION_WITH_NANOARROW=0"
echo "====================================================================="
exit 0;
elif [ ! -d "${source_dir}" ]; then
echo "====================================================================="
echo "The nanoarrow source is missing. Please clone the arrow-nanoarrow repository"
echo "to arrow/nanoarrow before running the integration tests:"
echo " git clone https://github.com/apache/arrow-nanoarrow.git path/to/arrow/nanoarrow"
echo "Not building nanoarrow because '${source_dir}' does not exist"
echo "====================================================================="
exit 1;
exit 0;
fi

set -x
Expand Down
8 changes: 3 additions & 5 deletions ci/scripts/rust_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,14 @@ export PARQUET_TEST_DATA=${arrow_dir}/cpp/submodules/parquet-testing/data

if [ "${ARCHERY_INTEGRATION_WITH_RUST}" -eq "0" ]; then
echo "====================================================================="
echo "Not building the Rust implementation."
echo "Not building Rust because ARCHERY_INTEGRATION_WITH_RUST=0"
echo "====================================================================="
exit 0;
elif [ ! -d "${source_dir}" ]; then
echo "====================================================================="
echo "The Rust source is missing. Please clone the arrow-rs repository"
echo "to arrow/rust before running the integration tests:"
echo " git clone https://github.com/apache/arrow-rs.git path/to/arrow/rust"
echo "Not building Rust because '${source_dir}' does not exist"
echo "====================================================================="
exit 1;
exit 0;
fi

set -x
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1748,8 +1748,6 @@ services:
volumes: *conda-volumes
environment:
<<: [*common, *ccache]
ARCHERY_INTEGRATION_WITH_NANOARROW: 0
ARCHERY_INTEGRATION_WITH_RUST: 0
# Tell Archery where Arrow binaries are located
ARROW_CPP_EXE_PATH: /build/cpp/debug
ARROW_NANOARROW_PATH: /build/nanoarrow
Expand Down

0 comments on commit 54b149e

Please sign in to comment.