remove centos7 on git action

apache · Oct 21, 2024 · 33c2c14 · 33c2c14
1 parent 73d4bf7
commit 33c2c14
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 99 deletions.
diff --git a/.github/workflows/build-push-env-docker.yml b/.github/workflows/build-push-env-docker.yml
@@ -35,7 +35,7 @@ jobs:
   build_compilation_env_docker_images:
     runs-on: ubuntu-latest
     env:
-      # The glibc version on ubuntu1804 and centos7 is lower than the node20 required, so
+      # The glibc version on ubuntu1804 is lower than the node20 required, so
       # we need to force the node version to 16.
       # See more details: https://github.com/actions/checkout/issues/1809
       ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16
@@ -47,10 +47,9 @@ jobs:
           - ubuntu1804
           - ubuntu2004
           - ubuntu2204
-          - centos7
     steps:
       - name: Checkout
-        # The glibc version on ubuntu1804 and centos7 is lower than the actions/checkout@v4 required, so
+        # The glibc version on ubuntu1804 is lower than the actions/checkout@v4 required, so
         # we need to force to use actions/checkout@v3.
         uses: actions/checkout@v4
       - name: Set up QEMU

diff --git a/.github/workflows/lint_and_test_cpp.yaml b/.github/workflows/lint_and_test_cpp.yaml
@@ -444,8 +444,8 @@ jobs:
           ./run.sh build --test --skip_thirdparty -j $(sysctl -n hw.physicalcpu)
           ccache -s
 
-  build_debug_on_centos7:
-    name: Build Debug on CentOS 7
+  build_debug_on_ubuntu:
+    name: Build Debug on Ubuntu 2204
     needs:
       - cpp_clang_format_linter
     runs-on: ubuntu-latest
@@ -456,7 +456,7 @@ jobs:
       ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16
       ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
     container:
-      image: apache/pegasus:thirdparties-bin-centos7-${{ github.base_ref }}
+      image: apache/pegasus:thirdparties-bin-ubuntu2204-${{ github.base_ref }}
     steps:
       - name: Clone code
         uses: actions/checkout@v3

diff --git a/.github/workflows/regular-build.yml b/.github/workflows/regular-build.yml
@@ -47,7 +47,7 @@ jobs:
     name: Build Cpp
     runs-on: ubuntu-latest
     env:
-      # The glibc version on ubuntu1804 and centos7 is lower than the node20 required, so
+      # The glibc version on ubuntu1804 is lower than the node20 required, so
       # we need to force the node version to 16.
       # See more details: https://github.com/actions/checkout/issues/1809
       ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16
@@ -59,7 +59,6 @@ jobs:
           - ubuntu1804
           - ubuntu2004
           - ubuntu2204
-          - centos7
         compiler:
           - "gcc,g++"
         include:
@@ -76,7 +75,7 @@ jobs:
         working-directory: /root/incubator-pegasus
     steps:
       - name: Clone Apache Pegasus Source
-        # The glibc version on ubuntu1804 and centos7 is lower than the actions/checkout@v4 required, so
+        # The glibc version on ubuntu1804 and is lower than the actions/checkout@v4 required, so
         # we need to force to use actions/checkout@v3.
         uses: actions/checkout@v3
       - name: Unpack prebuilt third-parties

diff --git a/.github/workflows/thirdparty-regular-push.yml b/.github/workflows/thirdparty-regular-push.yml
@@ -69,7 +69,7 @@ jobs:
   build_push_bin_docker_images:
     runs-on: ubuntu-latest
     env:
-      # The glibc version on ubuntu1804 and centos7 is lower than the node20 required, so
+      # The glibc version on ubuntu1804 is lower than the node20 required, so
       # we need to force the node version to 16.
       # See more details: https://github.com/actions/checkout/issues/1809
       ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16
@@ -82,9 +82,8 @@ jobs:
           - ubuntu1804
           - ubuntu2004
           - ubuntu2204
-          - centos7
     steps:
-      # The glibc version on ubuntu1804 and centos7 is lower than the actions/checkout@v4 required, so
+      # The glibc version on ubuntu1804 is lower than the actions/checkout@v4 required, so
       # we need to force to use actions/checkout@v3.
       - uses: actions/checkout@v3
       - name: Set up QEMU
@@ -113,7 +112,6 @@ jobs:
   build_push_bin_jemalloc_docker_images:
     runs-on: ubuntu-latest
     env:
-      # The glibc version on ubuntu1804 and centos7 is lower than the node20 required, so
       # we need to force the node version to 16.
       # See more details: https://github.com/actions/checkout/issues/1809
       ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16
@@ -126,9 +124,8 @@ jobs:
           - ubuntu1804
           - ubuntu2004
           - ubuntu2204
-          - centos7
     steps:
-      # The glibc version on ubuntu1804 and centos7 is lower than the actions/checkout@v4 required, so
+      # The glibc version on ubuntu1804 and is lower than the actions/checkout@v4 required, so
       # we need to force to use actions/checkout@v3.
       - uses: actions/checkout@v3
       - name: Set up QEMU

diff --git a/docker/README.md b/docker/README.md
@@ -35,7 +35,6 @@ Building environment for Pegasus compilation.
 
 Github Actions automatically rebuilds and publishes build-env for every commit.
 
-- `apache/pegasus:build-env-centos7-<branch>`
 - `apache/pegasus:build-env-ubuntu1804-<branch>`
 - `apache/pegasus:build-env-ubuntu2004-<branch>`
 - `apache/pegasus:build-env-ubuntu2204-<branch>`
@@ -58,7 +57,6 @@ without downloading from the cloud object storage.
 This is a Docker image for Pegasus unit-testing. It prebuilts the thirdparty libraries,
 so jobs based on this image can skip building third-parties.
 
-- `apache/pegasus:thirdparties-bin-centos7-<branch>`
 - `apache/pegasus:thirdparties-bin-ubuntu1804-<branch>`
 - `apache/pegasus:thirdparties-bin-ubuntu2004-<branch>`
 - `apache/pegasus:thirdparties-bin-ubuntu2204-<branch>`
diff --git a/docker/bcc-centos7/Dockerfile b/docker/bcc-centos7/Dockerfile
@@ -15,6 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
+# todo remove centos
+
 FROM centos:7.5.1804 as builder
 
 LABEL maintainer=wutao

diff --git a/docker/pegasus-build-env/centos7/Dockerfile b/docker/pegasus-build-env/centos7/Dockerfile
diff --git a/docker/thirdparties-bin/Dockerfile b/docker/thirdparties-bin/Dockerfile
@@ -16,7 +16,7 @@
 # under the License.
 
 ARG GITHUB_BRANCH=master
-ARG OS_VERSION=centos7
+ARG OS_VERSION=ubuntu2204
 FROM apache/pegasus:thirdparties-src-${GITHUB_BRANCH} as builder
 FROM apache/pegasus:build-env-${OS_VERSION}-${GITHUB_BRANCH}
 

diff --git a/docker/thirdparties-src/Dockerfile b/docker/thirdparties-src/Dockerfile
@@ -16,7 +16,7 @@
 # under the License.
 
 ARG GITHUB_BRANCH=master
-FROM apache/pegasus:build-env-centos7-${GITHUB_BRANCH} as builder
+FROM apache/pegasus:build-env-ubuntu2204-${GITHUB_BRANCH} as builder
 
 WORKDIR /root