diff --git a/.shippable.yml b/.shippable.yml index 7a649808482..bae0bd76f01 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -30,7 +30,7 @@ build: - export CCACHE_DIR=${SHIPPABLE_BUILD_DIR}/ccache/.ccache - > if [ "$IS_PULL_REQUEST" = "true" ]; then - ./scripts/ci/run_ci.sh -c -b ${PULL_REQUEST_BASE_BRANCH} -r origin -m ${MATRIX_BUILD} -M ${MATRIX_BUILDS} -p; + ./scripts/ci/run_ci.sh -c -b ${PULL_REQUEST_BASE_BRANCH} -r origin -m ${MATRIX_BUILD} -M ${MATRIX_BUILDS} -p ${PULL_REQUEST}; else ./scripts/ci/run_ci.sh -c -b ${PULL_REQUEST_BASE_BRANCH} -r origin -m ${MATRIX_BUILD} -M ${MATRIX_BUILDS}; fi; @@ -38,14 +38,14 @@ build: on_failure: - > if [ "$IS_PULL_REQUEST" = "true" ]; then - ./scripts/ci/run_ci.sh -f -b ${PULL_REQUEST_BASE_BRANCH} -r origin -m ${MATRIX_BUILD} -M ${MATRIX_BUILDS} -p; + ./scripts/ci/run_ci.sh -f -b ${PULL_REQUEST_BASE_BRANCH} -r origin -m ${MATRIX_BUILD} -M ${MATRIX_BUILDS} -p ${PULL_REQUEST}; else ./scripts/ci/run_ci.sh -f -b ${PULL_REQUEST_BASE_BRANCH} -r origin -m ${MATRIX_BUILD} -M ${MATRIX_BUILDS}; fi; on_success: - > if [ "$IS_PULL_REQUEST" = "true" ]; then - ./scripts/ci/run_ci.sh -s -b ${PULL_REQUEST_BASE_BRANCH} -r origin -m ${MATRIX_BUILD} -M ${MATRIX_BUILDS} -p; + ./scripts/ci/run_ci.sh -s -b ${PULL_REQUEST_BASE_BRANCH} -r origin -m ${MATRIX_BUILD} -M ${MATRIX_BUILDS} -p ${PULL_REQUEST}; else ./scripts/ci/run_ci.sh -s -b ${PULL_REQUEST_BASE_BRANCH} -r origin -m ${MATRIX_BUILD} -M ${MATRIX_BUILDS}; fi; diff --git a/scripts/ci/run_ci.sh b/scripts/ci/run_ci.sh index e44f40183fb..2b0778f1850 100755 --- a/scripts/ci/run_ci.sh +++ b/scripts/ci/run_ci.sh @@ -32,7 +32,7 @@ BSIM_BT_TEST_RESULTS_FILE="./bsim_bt_out/bsim_results.xml" MATRIX_BUILDS=1 MATRIX=1 -while getopts ":pm:b:r:M:cfsB:" opt; do +while getopts ":p:m:b:r:M:cfsB:" opt; do case $opt in c) echo "Execute CI" >&2 @@ -47,8 +47,8 @@ while getopts ":pm:b:r:M:cfsB:" opt; do FAILURE=1 ;; p) - echo "Testing a Pull Request." >&2 - PULL_REQUEST=1 + echo "Testing a Pull Request: $OPTARG." >&2 + PULL_REQUEST=$OPTARG ;; m) echo "Running on Matrix $OPTARG" >&2