Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,12 @@ jobs:
title: AMD64 Ubuntu 22.04 C++ ASAN UBSAN
ubuntu: 22.04
- arch: arm64v8
clang-tools: 10
clang-tools: 14
image: ubuntu-cpp
llvm: 10
llvm: 14
runs-on: ubuntu-24.04-arm
title: ARM64 Ubuntu 20.04 C++
ubuntu: 20.04
title: ARM64 Ubuntu 22.04 C++
ubuntu: 22.04
env:
ARCH: ${{ matrix.arch }}
ARROW_SIMD_LEVEL: ${{ matrix.simd-level }}
Expand Down
108 changes: 0 additions & 108 deletions ci/docker/ubuntu-20.04-cpp-minimal.dockerfile

This file was deleted.

197 changes: 0 additions & 197 deletions ci/docker/ubuntu-20.04-cpp.dockerfile

This file was deleted.

8 changes: 4 additions & 4 deletions ci/docker/ubuntu-22.04-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ RUN latest_system_llvm=14 && \
wget && \
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
code_name=$(lsb_release --codename --short) && \
if [ ${llvm} -gt 10 ]; then \
if [ ${llvm} -gt ${latest_system_llvm} ]; then \
echo "deb https://apt.llvm.org/${code_name}/ llvm-toolchain-${code_name}-${llvm} main" > \
/etc/apt/sources.list.d/llvm.list; \
fi && \
Expand All @@ -68,9 +68,6 @@ RUN apt-get update -y -q && \
bzip2 \
ca-certificates \
ccache \
ceph \
ceph-fuse \
ceph-mds \
curl \
gdb \
git \
Expand Down Expand Up @@ -180,6 +177,9 @@ RUN /arrow/ci/scripts/install_gcs_testbench.sh default
COPY ci/scripts/install_azurite.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_azurite.sh

COPY ci/scripts/install_ceph.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_ceph.sh

COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin

Expand Down
6 changes: 3 additions & 3 deletions ci/docker/ubuntu-24.04-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ RUN apt-get update -y -q && \
autoconf \
ca-certificates \
ccache \
ceph \
ceph-fuse \
ceph-mds \
cmake \
curl \
gdb \
Expand Down Expand Up @@ -165,6 +162,9 @@ RUN /arrow/ci/scripts/install_gcs_testbench.sh default
COPY ci/scripts/install_azurite.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_azurite.sh

COPY ci/scripts/install_ceph.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_ceph.sh

COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin

Expand Down
Loading
Loading