Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(github): remove centos7 on git action #2137

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/build-push-env-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint_and_test_cpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/regular-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -59,7 +59,6 @@ jobs:
- ubuntu1804
- ubuntu2004
- ubuntu2204
- centos7
compiler:
- "gcc,g++"
include:
Expand All @@ -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
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/thirdparty-regular-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,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
Expand All @@ -95,7 +95,7 @@ jobs:
# TODO(wangdan): disable centos7 temporarily before image build-env-centos7-* is fixed.
# - 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
Expand Down Expand Up @@ -124,7 +124,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
Expand All @@ -140,7 +139,7 @@ jobs:
# TODO(wangdan): disable centos7 temporarily before image build-env-centos7-* is fixed.
# - 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
Expand Down
2 changes: 0 additions & 2 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>`
Expand All @@ -61,7 +60,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>`
2 changes: 2 additions & 0 deletions docker/bcc-centos7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
80 changes: 0 additions & 80 deletions docker/pegasus-build-env/centos7/Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion docker/thirdparties-bin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.

ARG GITHUB_BRANCH=master
ARG OS_VERSION=centos7
ARG OS_VERSION=ubuntu2204
FROM apache/pegasus:thirdparties-src-${OS_VERSION}-${GITHUB_BRANCH} as builder
FROM apache/pegasus:build-env-${OS_VERSION}-${GITHUB_BRANCH}

Expand Down
2 changes: 1 addition & 1 deletion docker/thirdparties-src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.

ARG GITHUB_BRANCH=master
ARG OS_VERSION=centos7
ARG OS_VERSION=ubuntu2204
FROM apache/pegasus:build-env-${OS_VERSION}-${GITHUB_BRANCH} as builder

WORKDIR /root
Expand Down
Loading