This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/branch-2.2 by this push:
new 644529b22 Revert "ORC-1984: Add `debian13` to docker tests, docs, and
GitHub Action"
644529b22 is described below
commit 644529b224d144f206390a270041d15403b6fffa
Author: Dongjoon Hyun <[email protected]>
AuthorDate: Tue Sep 23 23:39:06 2025 -0700
Revert "ORC-1984: Add `debian13` to docker tests, docs, and GitHub Action"
This reverts commit 3c6b88d0379cb3adec005a9efb803819379aeb05.
---
.github/workflows/build_and_test.yml | 1 -
cmake_modules/ThirdpartyToolchain.cmake | 3 +-
docker/README.md | 2 +-
docker/debian13/Dockerfile | 52 ---------------------------------
docker/os-list.txt | 1 -
site/_docs/building.md | 3 +-
6 files changed, 3 insertions(+), 59 deletions(-)
diff --git a/.github/workflows/build_and_test.yml
b/.github/workflows/build_and_test.yml
index 5c3ec960f..da7b438d1 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -46,7 +46,6 @@ jobs:
os:
- debian11
- debian12
- - debian13
- ubuntu24
- oraclelinux8
- oraclelinux9
diff --git a/cmake_modules/ThirdpartyToolchain.cmake
b/cmake_modules/ThirdpartyToolchain.cmake
index 0208a51ee..851cdc4c2 100644
--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
@@ -538,8 +538,7 @@ else ()
-DCMAKE_INSTALL_LIBDIR=lib
-DCMAKE_POLICY_VERSION_MINIMUM=3.12
-DBUILD_SHARED_LIBS=OFF
- -Dprotobuf_BUILD_TESTS=OFF
- -Wno-stringop-overread)
+ -Dprotobuf_BUILD_TESTS=OFF)
if (BUILD_POSITION_INDEPENDENT_LIB)
set(PROTOBUF_CMAKE_ARGS ${PROTOBUF_CMAKE_ARGS}
-DCMAKE_POSITION_INDEPENDENT_CODE=ON)
diff --git a/docker/README.md b/docker/README.md
index f475022d0..2247cea96 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -2,7 +2,7 @@
## Supported OSes
-* Debian 11, 12, and 13
+* Debian 11 and 12
* Fedora 37
* Ubuntu 22 and 24
* Oracle Linux 9
diff --git a/docker/debian13/Dockerfile b/docker/debian13/Dockerfile
deleted file mode 100644
index 5e1df7bf4..000000000
--- a/docker/debian13/Dockerfile
+++ /dev/null
@@ -1,52 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# ORC compile for Debian 13
-#
-
-FROM debian:trixie-backports
-LABEL org.opencontainers.image.authors="Apache ORC project
<[email protected]>"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.ref.name="Apache ORC on Debian 13"
-LABEL org.opencontainers.image.version=""
-ARG jdk=21
-
-RUN apt-get update
-RUN apt-get install -y \
- cmake \
- gcc \
- g++ \
- git \
- libsasl2-dev \
- libssl-dev \
- make \
- curl \
- maven \
- openjdk-${jdk}-jdk
-
-WORKDIR /root
-
-VOLUME /root/.m2/repository
-
-CMD if [ ! -d orc ]; then \
- echo "No volume provided, building from apache main."; \
- echo "Pass '-v`pwd`:/root/orc' to docker run to build local source."; \
- git clone https://github.com/apache/orc.git -b main; \
- fi && \
- mkdir build && \
- cd build && \
- cmake ../orc && \
- make package test-out
diff --git a/docker/os-list.txt b/docker/os-list.txt
index 65ff27719..e138aaf49 100644
--- a/docker/os-list.txt
+++ b/docker/os-list.txt
@@ -1,6 +1,5 @@
debian11
debian12
-debian13
ubuntu22
ubuntu24
oraclelinux8
diff --git a/site/_docs/building.md b/site/_docs/building.md
index 967cde2e6..e9a98ae56 100644
--- a/site/_docs/building.md
+++ b/site/_docs/building.md
@@ -10,7 +10,7 @@ dockerUrl: https://github.com/apache/orc/blob/main/docker
The C++ library is supported on the following operating systems:
* MacOS 14 to 26
-* Debian 11 to 13
+* Debian 11 to 12
* Ubuntu 22.04 to 24.04
* Oracle Linux 8 to 9
* Amazon Linux 2023
@@ -28,7 +28,6 @@ is in the docker subdirectory, for the list of packages
required to build ORC:
* [Debian 11]({{ page.dockerUrl }}/debian11/Dockerfile)
* [Debian 12]({{ page.dockerUrl }}/debian12/Dockerfile)
-* [Debian 13]({{ page.dockerUrl }}/debian13/Dockerfile)
* [Ubuntu 22]({{ page.dockerUrl }}/ubuntu22/Dockerfile)
* [Ubuntu 24]({{ page.dockerUrl }}/ubuntu24/Dockerfile)
* [Oracle Linux 8]({{ page.dockerUrl }}/oraclelinux8/Dockerfile)
