This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/main by this push:
new c29857a6a ORC-1745: Remove `Ubuntu 20.04` Support
c29857a6a is described below
commit c29857a6acf0bea11672cc37e5da140daa3c483a
Author: Dongjoon Hyun <dongj...@apache.org>
AuthorDate: Mon Jul 15 00:54:49 2024 -0700
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 2.1.0.
1. Remove from GitHub CIs
2. Remove from `docker` directory
3. Remove from Apache ORC Website.
### Why are the changes needed?
Apache ORC 2.1.0 is scheduled in 2025 and Ubuntu 20.04 LTS is going to
reach the end of support April 2025. We had better focus on the latest OSes at
Apache ORC 2.1.0.
| 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 #1983 from dongjoon-hyun/ORC-1745.
Authored-by: Dongjoon Hyun <dongj...@apache.org>
Signed-off-by: Dongjoon Hyun <dongj...@apache.org>
---
.github/workflows/build_and_test.yml | 9 ++---
docker/README.md | 2 +-
docker/ubuntu20/Dockerfile | 65 ------------------------------------
site/_docs/building.md | 3 +-
4 files changed, 4 insertions(+), 75 deletions(-)
diff --git a/.github/workflows/build_and_test.yml
b/.github/workflows/build_and_test.yml
index edb880be2..f6fca02e8 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -47,7 +47,6 @@ jobs:
fail-fast: false
matrix:
os:
- - ubuntu-20.04
- ubuntu-22.04
- ubuntu-24.04
- macos-12
@@ -85,11 +84,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
openssl@1.1` ..
- fi
+ cmake -DANALYZE_JAVA=ON -DOPENSSL_ROOT_DIR=`brew --prefix openssl@1.1`
..
make package test-out
- name: Step on failure
if: ${{ failure() }}
@@ -152,7 +147,7 @@ jobs:
doc:
name: "Javadoc generation"
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v2
diff --git a/docker/README.md b/docker/README.md
index e9a3b65b1..1c4437aa0 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -2,7 +2,7 @@
* Debian 11 and 12
* Fedora 37
-* Ubuntu 20, 22, 24
+* Ubuntu 22 and 24
* Oracle Linux 9
## Pre-built Images
diff --git a/docker/ubuntu20/Dockerfile b/docker/ubuntu20/Dockerfile
deleted file mode 100644
index 59a487bb8..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 <d...@orc.apache.org>"
-ARG jdk=17
-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 f1cc015ea..367698b1c 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 12
* MacOS 12 to 14
-* Ubuntu 20.04 to 24.04
+* Ubuntu 22.04 to 24.04
You'll want to install the usual set of developer tools, but at least:
@@ -27,7 +27,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)
-* [Ubuntu 20]({{ page.dockerUrl }}/ubuntu20/Dockerfile)
* [Ubuntu 22]({{ page.dockerUrl }}/ubuntu22/Dockerfile)
* [Ubuntu 24]({{ page.dockerUrl }}/ubuntu24/Dockerfile)
* [Fedora 37]({{ page.dockerUrl }}/fedora37/Dockerfile)
