You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pegasus.apache.org by la...@apache.org on 2023/03/27 15:19:01 UTC
[incubator-pegasus] branch fix_regular_build updated: chore(CI): fix regularly build failure
This is an automated email from the ASF dual-hosted git repository.
laiyingchun pushed a commit to branch fix_regular_build
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/fix_regular_build by this push:
new b690ee93b chore(CI): fix regularly build failure
b690ee93b is described below
commit b690ee93ba8c6f50e6551347601fc89802a3c95f
Author: Yingchun Lai <la...@apache.org>
AuthorDate: Mon Mar 27 23:18:42 2023 +0800
chore(CI): fix regularly build failure
---
.github/workflows/regular-build.yml | 23 +++++++----------------
run.sh | 10 +++++-----
2 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/.github/workflows/regular-build.yml b/.github/workflows/regular-build.yml
index 56bbaffb7..9ba4afc55 100644
--- a/.github/workflows/regular-build.yml
+++ b/.github/workflows/regular-build.yml
@@ -58,17 +58,14 @@ jobs:
- ubuntu2204
- centos6
- centos7
- compiler-family:
- - gcc
+ compiler:
+ - "gcc,g++"
include:
- - compiler-family: clang
- compiler: "clang-14,clang++-14"
+ - compiler: "clang-14,clang++-14"
os: ubuntu2204
- - compiler-family: clang
- compiler: "clang-10,clang++-10"
+ - compiler: "clang-10,clang++-10"
os: ubuntu2004
- - compiler-family: clang
- compiler: "clang-9,clang++-9"
+ - compiler: "clang-9,clang++-9"
os: ubuntu1804
container:
image: apache/pegasus:thirdparties-bin-${{ matrix.os }}-${{ github.ref_name }}
@@ -84,14 +81,8 @@ jobs:
run: |
unzip /root/thirdparties-bin.zip -d ./thirdparty
rm -f /root/thirdparties-bin.zip
- - name: Compilation Pegasus on GCC
- if: ${{ matrix.compiler-family == 'gcc' }}
- run: ./run.sh build -c --skip_thirdparty
- - name: Compilation Pegasus on Clang
- if: ${{ matrix.compiler-family == 'clang' }}
- env:
- COMPILER: ${{ matrix.compiler }}
- run: ./run.sh build --test --compiler $COMPILER --skip_thirdparty -j $(nproc)
+ - name: Compilation Pegasus
+ run: ./run.sh build --test --compiler ${{ matrix.compiler }} --skip_thirdparty -j $(nproc)
- name: Packaging Server
run: ./run.sh pack_server
diff --git a/run.sh b/run.sh
index 5cf2a7f11..ff14a569c 100755
--- a/run.sh
+++ b/run.sh
@@ -259,11 +259,11 @@ function run_build()
if [ "$CLEAR" == "YES" ]; then
echo "Clear $BUILD_DIR ..."
rm -rf $BUILD_DIR
- rm ${ROOT}/src/base/rrdb_types.cpp
- rm ${ROOT}/src/include/rrdb/rrdb_types.h
- rm ${ROOT}/src/common/serialization_helper/dsn.layer2_types.h
- rm ${ROOT}/src/runtime/dsn.layer2_types.cpp
- rm ${ROOT}/src/include/pegasus/git_commit.h
+ rm -f ${ROOT}/src/base/rrdb_types.cpp
+ rm -f ${ROOT}/src/include/rrdb/rrdb_types.h
+ rm -f ${ROOT}/src/common/serialization_helper/dsn.layer2_types.h
+ rm -f ${ROOT}/src/runtime/dsn.layer2_types.cpp
+ rm -f ${ROOT}/src/include/pegasus/git_commit.h
fi
pushd ${ROOT}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org