This is an automated email from the ASF dual-hosted git repository.

wangdan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git


The following commit(s) were added to refs/heads/master by this push:
     new 5f83f7492 chore: remove the supporting of EOL OS CentOS 6 (#1557)
5f83f7492 is described below

commit 5f83f7492dea289bb585df7da3657f55c2572a8f
Author: Yingchun Lai <[email protected]>
AuthorDate: Thu Jul 6 14:49:53 2023 +0800

    chore: remove the supporting of EOL OS CentOS 6 (#1557)
    
    https://github.com/apache/incubator-pegasus/issues/1348
    
    Benifits:
    - Updating the list of OS versions we would test and support, including 
adding
       newer OS versions and removing EOL OS versions
    - A first step towards supporting C++17 which need higher version of GCC
    
    Although we drop the supporting of CentOS 6, Pegasus developers and
    users are still able to build and run Pegasus themselves.
---
 .github/workflows/build-push-env-docker.yml   |  1 -
 .github/workflows/regular-build.yml           |  1 -
 .github/workflows/thirdparty-regular-push.yml |  2 -
 docker/pegasus-build-env/centos6/Dockerfile   | 87 ---------------------------
 4 files changed, 91 deletions(-)

diff --git a/.github/workflows/build-push-env-docker.yml 
b/.github/workflows/build-push-env-docker.yml
index e7d77d34e..b847587c3 100644
--- a/.github/workflows/build-push-env-docker.yml
+++ b/.github/workflows/build-push-env-docker.yml
@@ -42,7 +42,6 @@ jobs:
           - ubuntu1804
           - ubuntu2004
           - ubuntu2204
-          - centos6
           - centos7
     steps:
       - name: Checkout
diff --git a/.github/workflows/regular-build.yml 
b/.github/workflows/regular-build.yml
index 373882f91..798b28e3a 100644
--- a/.github/workflows/regular-build.yml
+++ b/.github/workflows/regular-build.yml
@@ -55,7 +55,6 @@ jobs:
           - ubuntu1804
           - ubuntu2004
           - ubuntu2204
-          - centos6
           - centos7
         compiler:
           - "gcc,g++"
diff --git a/.github/workflows/thirdparty-regular-push.yml 
b/.github/workflows/thirdparty-regular-push.yml
index ffc880868..152fe15a7 100644
--- a/.github/workflows/thirdparty-regular-push.yml
+++ b/.github/workflows/thirdparty-regular-push.yml
@@ -74,7 +74,6 @@ jobs:
           - ubuntu1804
           - ubuntu2004
           - ubuntu2204
-          - centos6
           - centos7
     steps:
       - uses: actions/checkout@v3
@@ -111,7 +110,6 @@ jobs:
           - ubuntu1804
           - ubuntu2004
           - ubuntu2204
-          - centos6
           - centos7
     steps:
       - uses: actions/checkout@v3
diff --git a/docker/pegasus-build-env/centos6/Dockerfile 
b/docker/pegasus-build-env/centos6/Dockerfile
deleted file mode 100644
index 18283121f..000000000
--- a/docker/pegasus-build-env/centos6/Dockerfile
+++ /dev/null
@@ -1,87 +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.
-
-FROM centos:6.10
-
-LABEL maintainer=jiashuo
-
-# defaut repo url hasn't been supported, use thirdparty repo url
-RUN curl https://www.getpagespeed.com/files/centos6-eol.repo --output 
/etc/yum.repos.d/CentOS-Base.repo
-RUN curl https://www.getpagespeed.com/files/centos6-epel-eol.repo --output 
/etc/yum.repos.d/epel.repo
-RUN curl https://www.getpagespeed.com/files/centos6-scl-eol.repo --output 
/etc/yum.repos.d/CentOS-SCLo-scl.repo
-RUN curl https://www.getpagespeed.com/files/centos6-scl-rh-eol.repo --output 
/etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
-
-# diable gpgcheck, otherwise the repo check will be failed.
-RUN sed -i 's/gpgcheck=1/gpgcheck=0/g'  /etc/yum.repos.d/CentOS-Base.repo
-RUN sed -i 's/gpgcheck=1/gpgcheck=0/g' /etc/yum.repos.d/epel.repo
-RUN sed -i 's/gpgcheck=1/gpgcheck=0/g' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
-RUN sed -i 's/gpgcheck=1/gpgcheck=0/g' /etc/yum.repos.d/CentOS-SCLo-scl.repo
-
-RUN yum -y install \
-                devtoolset-7-gcc \
-                devtoolset-7-gcc-c++ \
-                java-1.8.0-openjdk-devel \
-                git \
-                gettext \
-                curl-devel \
-                rh-maven33 \
-                python27 \
-                python34 \
-                automake \
-                autoconf \
-                make \
-                libtool \
-                file \
-                wget \
-                ccache \
-                nc \
-                zip \
-                gdb \
-                vim \
-                unzip \
-                which \
-                openssl-devel \
-                libaio-devel \
-                snappy-devel \
-                bzip2-devel \
-                zlib \
-                zlib-devel \
-                libzstd-devel \
-                lz4-devel \
-                bison \
-                flex \
-                patch; \
-                yum clean all; \
-                rm -rf /var/cache/yum;
-
-ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0/
-ENV GCC_HOME=/opt/rh/devtoolset-7/root/usr/
-ENV PYTHON2_HOME=/opt/rh/python27/root/usr/
-ENV MAVEN_HOME=/opt/rh/rh-maven33/root/usr/
-
-ENV PATH=$MAVEN_HOME/bin:$JAVA_HOME/bin:$GCC_HOME/bin:$PYTHON2_HOME/bin/:$PATH
-ENV 
LD_LIBRARY_PATH=$JAVA_HOME/jre/lib/amd64/server:$PYTHON2_HOME/lib64/:$LD_LIBRARY_PATH
-
-RUN python -m pip install --no-cache-dir --user --upgrade pip==20.3.4 && 
python -m pip install --no-cache-dir cmake -i 
https://pypi.tuna.tsinghua.edu.cn/simple
-
-RUN wget --progress=dot:giga 
https://github.com/apache/thrift/archive/refs/tags/0.11.0.tar.gz -P /opt/thrift 
&& \
-    cd /opt/thrift && tar xzf 0.11.0.tar.gz && cd thrift-0.11.0 && 
./bootstrap.sh && \
-    ./configure --enable-libs=no && \
-    make -j$(($(nproc)/2+1)) && make install && cd - && \
-    rm -rf thrift-0.11.0 0.11.0.tar.gz
-
-WORKDIR /root/apache


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to