Skip to content
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

chore(ci): Tweak compose, image, and ignores #698

Merged
merged 1 commit into from
Jan 2, 2025
Merged

chore(ci): Tweak compose, image, and ignores #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ci/docker/alpine.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN apk add bash linux-headers git cmake R R-dev g++ gfortran gnupg curl py3-vir

# For Arrow C++
COPY ci/scripts/build-arrow-cpp-minimal.sh /
RUN /build-arrow-cpp-minimal.sh 18.0.0 /arrow
RUN /build-arrow-cpp-minimal.sh 18.1.0 /arrow

# There's a missing define that numpy's build needs on s390x and there is no wheel
RUN (grep -e "S390" /usr/include/bits/hwcap.h && echo "#define HWCAP_S390_VX HWCAP_S390_VXRS" >> /usr/include/bits/hwcap.h) || true
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/coverage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ function main() {
pushd "${SANDBOX_DIR}/nanoarrow"

cmake "${TARGET_NANOARROW_DIR}" \
-DNANOARROW_DEVICE=ON -DNANOARROW_IPC=ON \
-DNANOARROW_DEVICE=ON -DNANOARROW_IPC=ON -DNANOARROW_IPC_WITH_ZSTD=ON \
-DNANOARROW_BUILD_TESTS=ON -DNANOARROW_BUILD_TESTS_WITH_ARROW=ON \
-DNANOARROW_CODE_COVERAGE=ON
cmake --build .
Expand Down
6 changes: 1 addition & 5 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@ services:
command: "/bin/bash /nanoarrow/dev/release/verify-release-candidate.sh $NANOARROW_VERIFY_ARGS"

coverage:
build:
context: .
dockerfile: ci/docker/ubuntu.dockerfile
args:
NANOARROW_ARCH: ${NANOARROW_ARCH}
image: ${REPO}:ubuntu
volumes:
# Don't mix the "dev tools" and "source" checkouts
- ./ci/scripts/coverage.sh:/coverage.sh
Expand Down
1 change: 1 addition & 0 deletions python/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
# under the License.

src/nanoarrow/_*.c
.mesonpy-*

# Byte-compiled / optimized / DLL files
__pycache__/
Expand Down
Loading