Skip to content

Commit fa2c894

Browse files
author
MarcoFalke
committed
ci: move-only CI_CONTAINER_ID to 02_run_container.sh
This limits the scope of the CI_CONTAINER_ID symbol. Can be reviewed with --color-moved=dimmed-zebra
1 parent fa695b4 commit fa2c894

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

ci/test/02_run_container.sh

+7
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,10 @@ CI_EXEC "${BASE_ROOT_DIR}/ci/test/01_base_install.sh"
6868
CI_EXEC git config --global --add safe.directory \"*\"
6969

7070
CI_EXEC mkdir -p "${BINS_SCRATCH_DIR}"
71+
72+
CI_EXEC "${BASE_ROOT_DIR}/ci/test/06_script_b.sh"
73+
74+
if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
75+
echo "Stop and remove CI container by ID"
76+
docker container kill "${CI_CONTAINER_ID}"
77+
fi

ci/test_run_all.sh

+1-7
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,5 @@
77
export LC_ALL=C.UTF-8
88

99
set -o errexit; source ./ci/test/00_setup_env.sh
10-
set -o errexit; source "./ci/test/02_run_container.sh"
1110
set -o errexit
12-
CI_EXEC "${BASE_ROOT_DIR}/ci/test/06_script_b.sh"
13-
14-
if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
15-
echo "Stop and remove CI container by ID"
16-
docker container kill "${CI_CONTAINER_ID}"
17-
fi
11+
"./ci/test/02_run_container.sh"

0 commit comments

Comments
 (0)