From 92c6810f216b2bf638429212871ae6d57c76d868 Mon Sep 17 00:00:00 2001 From: liuxu <759587231@qq.com> Date: Mon, 27 Jul 2020 04:21:50 -0700 Subject: [PATCH] ci: apollo_ci.sh improvement --- apollo.sh | 3 +++ scripts/apollo_ci.sh | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/apollo.sh b/apollo.sh index 24c14668d0..2a38b36765 100755 --- a/apollo.sh +++ b/apollo.sh @@ -176,6 +176,9 @@ function main() { citest) env ${APOLLO_ENV} bash "${ci_sh}" "test" ;; + cilint) + env ${APOLLO_ENV} bash "${ci_sh}" "lint" + ;; check) build_test_and_lint ;; diff --git a/scripts/apollo_ci.sh b/scripts/apollo_ci.sh index ba6e1ecaaa..66cf66e007 100755 --- a/scripts/apollo_ci.sh +++ b/scripts/apollo_ci.sh @@ -10,27 +10,34 @@ ARCH="$(uname -m)" APOLLO_BUILD_SH="${APOLLO_ROOT_DIR}/scripts/apollo_build.sh" APOLLO_TEST_SH="${APOLLO_ROOT_DIR}/scripts/apollo_test.sh" +APOLLO_LINT_SH="${APOLLO_ROOT_DIR}/scripts/apollo_lint.sh" function run_ci_build() { - info "Running CI Build ..." env USE_ESD_CAN=${USE_ESD_CAN} bash "${APOLLO_BUILD_SH}" } function run_ci_test() { - info "Running CI Test ..." env USE_ESD_CAN=${USE_ESD_CAN} bash "${APOLLO_TEST_SH}" --config=unit_test } +function run_ci_lint() { + env USE_ESD_CAN=${USE_ESD_CAN} bash "${APOLLO_LINT_SH}" cpp +} + function main() { local cmd="$1" if [ -z "${cmd}" ]; then cmd="build" fi - if [ "$1" == "test" ]; then + if [ "${cmd}" == "test" ]; then info "Running CI Test ..." run_ci_test - else + elif [ "${cmd}" == "build" ]; then + info "Running CI Build ..." run_ci_build + elif [ "${cmd}" == "lint" ]; then + info "Running CI Lint ..." + run_ci_lint fi success "ci${cmd} finished." } -- GitLab