This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-1.8
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/branch-1.8 by this push:
new 92c55ac0b ORC-1745: Remove `Ubuntu 20.04` Support
92c55ac0b is described below
commit 92c55ac0b23cccbd51cdac0e174f0dee70cd67d6
Author: Dongjoon Hyun <[email protected]>
AuthorDate: Fri Apr 4 17:08:53 2025 +0900
ORC-1745: Remove `Ubuntu 20.04` Support
### What changes were proposed in this pull request?
This PR aims to remove `Ubuntu 20.04` Support from Apache ORC 1.8.x
according to `GitHub Action End-Of-Support of Ubuntu 20.04`.
- https://github.com/actions/runner-images/issues/11101
1. Remove from GitHub CIs
2. Remove from `docker` directory
3. Remove from Apache ORC Website.
### Why are the changes needed?
| Version | RELEASED | END OF STANDARD SUPPORT |
| - | - | - |
| Ubuntu 20.04 LTS (Focal Fossa) | Apr 2020 | Apr 2025 |
### How was this patch tested?
Pass the CIs. However, it will pass because this is a removal of test
coverage.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #2179 from dongjoon-hyun/ORC-1745-1.8.
Authored-by: Dongjoon Hyun <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
---
.github/workflows/build_and_test.yml | 13 +++-----
docker/README.md | 2 +-
docker/os-list.txt | 1 -
docker/ubuntu20/Dockerfile | 65 ------------------------------------
site/_docs/building.md | 3 +-
5 files changed, 6 insertions(+), 78 deletions(-)
diff --git a/.github/workflows/build_and_test.yml
b/.github/workflows/build_and_test.yml
index 9dbf23d73..dbfb2e97b 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -23,7 +23,7 @@ jobs:
- centos7
- debian10
- debian11
- - ubuntu20
+ - ubuntu22
- fedora37
- oraclelinux9
steps:
@@ -41,7 +41,6 @@ jobs:
fail-fast: false
matrix:
os:
- - ubuntu-20.04
- ubuntu-22.04
- macos-13
java:
@@ -51,7 +50,7 @@ jobs:
cxx:
- clang++
include:
- - os: ubuntu-20.04
+ - os: ubuntu-22.04
java: 8
cxx: g++
env:
@@ -71,11 +70,7 @@ jobs:
mkdir -p ~/.m2
mkdir build
cd build
- if [ "${{ matrix.os }}" = "ubuntu-20.04" ]; then
- cmake -DANALYZE_JAVA=ON -DCMAKE_CXX_COMPILER=${{ matrix.cxx }}
-DSTOP_BUILD_ON_WARNING=OFF ..
- else
- cmake -DANALYZE_JAVA=ON -DOPENSSL_ROOT_DIR=`brew --prefix
[email protected]` ..
- fi
+ cmake -DANALYZE_JAVA=ON -DOPENSSL_ROOT_DIR=`brew --prefix [email protected]`
..
make package test-out
- name: Step on failure
if: ${{ failure() }}
@@ -100,7 +95,7 @@ jobs:
doc:
name: "Javadoc generation"
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v2
diff --git a/docker/README.md b/docker/README.md
index 59792cb2b..1b974eeb5 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -3,7 +3,7 @@
* CentOS 7
* Debian 10 and 11
* Fedora 37
-* Ubuntu 20 and 22
+* Ubuntu 22
* Rocky 9
## Pre-built Images
diff --git a/docker/os-list.txt b/docker/os-list.txt
index e2f544e1d..422a3a586 100644
--- a/docker/os-list.txt
+++ b/docker/os-list.txt
@@ -1,7 +1,6 @@
centos7
debian10
debian11
-ubuntu20
ubuntu22
fedora37
oraclelinux9
diff --git a/docker/ubuntu20/Dockerfile b/docker/ubuntu20/Dockerfile
deleted file mode 100644
index 79d0e22ab..000000000
--- a/docker/ubuntu20/Dockerfile
+++ /dev/null
@@ -1,65 +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 Ubuntu 20
-#
-
-FROM ubuntu:20.04
-LABEL maintainer="Apache ORC project <[email protected]>"
-ARG jdk=8
-ARG cc=gcc
-
-RUN ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime
-RUN apt-get update
-RUN apt-get install -y \
- cmake \
- git \
- libsasl2-dev \
- libssl-dev \
- make \
- curl \
- maven \
- openjdk-${jdk}-jdk \
- tzdata; \
- if [ "${cc}" = "gcc" ] ; then \
- apt-get install -y \
- gcc \
- g++ \
- ; else \
- apt-get install -y \
- clang \
- && \
- update-alternatives --set cc /usr/bin/clang && \
- update-alternatives --set c++ /usr/bin/clang++ \
- ; fi
-RUN update-alternatives --set java $(update-alternatives --list java | grep
${jdk}) && \
- update-alternatives --set javac $(update-alternatives --list javac | grep
${jdk})
-
-ENV CC=cc
-ENV CXX=c++
-
-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/site/_docs/building.md b/site/_docs/building.md
index 6480faded..ec24574e8 100644
--- a/site/_docs/building.md
+++ b/site/_docs/building.md
@@ -12,7 +12,7 @@ The C++ library is supported on the following operating
systems:
* CentOS 7
* Debian 10 to 11
* MacOS 13 to 14
-* Ubuntu 20.04 to 22.04
+* Ubuntu 22.04
You'll want to install the usual set of developer tools, but at least:
@@ -28,7 +28,6 @@ is in the docker subdirectory, for the list of packages
required to build ORC:
* [CentOS 7]({{ page.dockerUrl }}/centos7/Dockerfile)
* [Debian 10]({{ page.dockerUrl }}/debian10/Dockerfile)
* [Debian 11]({{ page.dockerUrl }}/debian11/Dockerfile)
-* [Ubuntu 20]({{ page.dockerUrl }}/ubuntu20/Dockerfile)
* [Ubuntu 22]({{ page.dockerUrl }}/ubuntu22/Dockerfile)
To build a normal release:
