File tree Expand file tree Collapse file tree 5 files changed +18
-28
lines changed
Expand file tree Collapse file tree 5 files changed +18
-28
lines changed Original file line number Diff line number Diff line change @@ -52,7 +52,7 @@ ULIMIT_CORE=-1
5252# Default versions for platforms
5353ALMALINUX = 8
5454ALPINE_LINUX = 3.22
55- DEBIAN = 12
55+ DEBIAN = 13
5656FEDORA = 42
5757UBUNTU = 22.04
5858
@@ -61,11 +61,9 @@ CLANG_TOOLS=18
6161CMAKE = 3.26.0
6262CUDA = 11.7.1
6363DASK = latest
64- DOTNET = 8.0
6564GCC =
6665HDFS = 3.2.1
6766JDK = 11
68- KARTOTHEK = latest
6967# LLVM 12 and GCC 11 reports -Wmismatched-new-delete.
7068LLVM = 18
7169MAVEN = 3.8.7
@@ -79,7 +77,6 @@ PYTHON_IMAGE_TAG=3.10
7977PYTHON_ABI_TAG = cp310
8078R = 4.5
8179SPARK = master
82- TURBODBC = latest
8380
8481# These correspond to images on Docker Hub that contain R, e.g. rhub/ubuntu-release:latest
8582R_IMAGE = ubuntu-release
Original file line number Diff line number Diff line change @@ -55,26 +55,18 @@ RUN apt-get update -y -q && \
5555 libboost-system-dev \
5656 libbrotli-dev \
5757 libbz2-dev \
58- libc-ares-dev \
5958 libcurl4-openssl-dev \
6059 libgflags-dev \
6160 libgmock-dev \
6261 libgoogle-glog-dev \
6362 libgrpc++-dev \
64- libidn2-dev \
65- libkrb5-dev \
66- libldap-dev \
6763 liblz4-dev \
68- libnghttp2 -dev \
64+ libopentelemetry-proto -dev \
6965 libprotobuf-dev \
7066 libprotoc-dev \
71- libpsl-dev \
7267 libre2-dev \
73- librtmp-dev \
7468 libsnappy-dev \
7569 libsqlite3-dev \
76- libssh-dev \
77- libssh2-1-dev \
7870 libssl-dev \
7971 libthrift-dev \
8072 libutf8proc-dev \
@@ -96,6 +88,7 @@ RUN apt-get update -y -q && \
9688 rapidjson-dev \
9789 rsync \
9890 tzdata \
91+ tzdata-legacy \
9992 zlib1g-dev && \
10093 apt-get clean && \
10194 rm -rf /var/lib/apt/lists/*
Original file line number Diff line number Diff line change @@ -31,11 +31,9 @@ RUN apt-get update -y && \
3131 lsb-release && \
3232 gpg --keyserver keyserver.ubuntu.com \
3333 --recv-key 95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7 && \
34- gpg --export 95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7 | \
35- gpg --no-default-keyring \
36- --keyring /usr/share/keyrings/cran.gpg \
37- --import - && \
38- echo "deb [signed-by=/usr/share/keyrings/cran.gpg] https://cloud.r-project.org/bin/linux/$(lsb_release -is | tr 'A-Z' 'a-z') $(lsb_release -cs)-cran40/" | \
34+ gpg --armor --export 95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7 | \
35+ tee /usr/share/keyrings/cran.asc && \
36+ echo "deb [signed-by=/usr/share/keyrings/cran.asc] https://cloud.r-project.org/bin/linux/$(lsb_release -is | tr 'A-Z' 'a-z') $(lsb_release -cs)-cran40/" | \
3937 tee /etc/apt/sources.list.d/cran.list && \
4038 if [ -f /etc/apt/sources.list.d/debian.sources ]; then \
4139 sed -i \
Original file line number Diff line number Diff line change @@ -242,10 +242,10 @@ TEST(Jemalloc, GetAllocationStats) {
242242
243243 // Check allocated stats change due to allocation
244244 ASSERT_NEAR (allocated - allocated0, 70000 , 50000 );
245- ASSERT_NEAR (active - active0, 100000 , 90000 );
246- ASSERT_NEAR (metadata - metadata0, 500 , 460 );
247- ASSERT_NEAR (resident - resident0, 120000 , 110000 );
248- ASSERT_NEAR (mapped - mapped0, 100000 , 90000 );
245+ ASSERT_GE (active - active0, allocated - allocated0 );
246+ ASSERT_GT (metadata, metadata0 );
247+ ASSERT_GE (resident - resident0, allocated - allocated0 );
248+ ASSERT_GE (mapped - mapped0, allocated - allocated0 );
249249 ASSERT_NEAR (retained - retained0, 0 , 40000 );
250250
251251 ASSERT_NEAR (thread_peak_read - thread_peak_read0, 1024 , 700 );
Original file line number Diff line number Diff line change @@ -451,7 +451,7 @@ tasks:
451451 flags : -e CC=gcc-14 -e CXX=g++-14 -e RapidJSON_SOURCE=BUNDLED
452452 image : ubuntu-cpp
453453
454- {% for debian_version in ["12 "] %}
454+ {% for debian_version in ["13 "] %}
455455 test-debian-{{ debian_version }}-cpp-amd64 :
456456 ci : github
457457 template : docker-tests/github.linux.yml
@@ -589,23 +589,25 @@ tasks:
589589 UBUNTU : 22.04
590590 image : ubuntu-python-313-freethreading
591591
592- test-debian-12-python-3-amd64 :
592+ {% for debian_version in ["13"] %}
593+ test-debian-{{ debian_version }}-python-3-amd64 :
593594 ci : github
594595 template : docker-tests/github.linux.yml
595596 params :
596597 env :
597- DEBIAN : 12
598+ DEBIAN : " {{ debian_version }} "
598599 image : debian-python
599600
600- test-debian-12 -python-3-i386 :
601+ test-debian-{{ debian_version }} -python-3-i386 :
601602 ci : github
602603 template : docker-tests/github.linux.yml
603604 params :
604605 env :
605606 ARCH : i386
606- DEBIAN : 12
607+ DEBIAN : " {{ debian_version }} "
607608 flags : " -e ARROW_S3=OFF -e ARROW_GANDIVA=OFF"
608609 image : debian-python
610+ {% endfor %}
609611
610612 test-ubuntu-22.04-python-3 :
611613 ci : github
@@ -756,7 +758,7 @@ tasks:
756758 template : r/github.macos.m1san.yml
757759
758760 # be sure to update binary-task.rb when upgrading Debian
759- test-debian-12 -docs :
761+ test-debian-13 -docs :
760762 ci : github
761763 template : docs/github.linux.yml
762764 params :
You can’t perform that action at this time.
0 commit comments