Skip to content

Commit 45a1527

Browse files
committed
Address review comment.
1 parent fcebd90 commit 45a1527

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

ci/cloudbuild/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ if [[ "${DOCKER_FLAG}" = "true" ]]; then
236236
mkdir -p "${out_cmake}" "${out_home}/.config/gcloud"
237237
image="gcb-${DISTRO_FLAG}:latest"
238238
io::log_h2 "Building docker image: ${image}"
239-
io::log_and_run \
239+
io::run \
240240
docker build -t "${image}" "--build-arg=NCPU=$(nproc)" \
241241
-f "ci/cloudbuild/dockerfiles/${DISTRO_FLAG}.Dockerfile" ci
242242
io::log_h2 "Starting docker container: ${image}"
@@ -278,7 +278,7 @@ if [[ "${DOCKER_FLAG}" = "true" ]]; then
278278
printf "\n\n"
279279
cmd=("bash")
280280
fi
281-
io::log_and_run docker run "${run_flags[@]}" "${image}" "${cmd[@]}"
281+
io::run docker run "${run_flags[@]}" "${image}" "${cmd[@]}"
282282
exit
283283
fi
284284

@@ -322,4 +322,4 @@ args=(
322322
"--substitutions=$(printf "%s," "${subs[@]}")"
323323
"--project=${project}"
324324
)
325-
io::log_and_run gcloud builds submit "${args[@]}" .
325+
io::run gcloud builds submit "${args[@]}" .

ci/lib/io.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ function io::log_bold() {
8383
# Logs the arguments, in bold with a timestamp, and then executes them.
8484
# This is like executing a command under "set -x" in the shell (including
8585
# the ${PS4} prefix).
86-
function io::log_and_run() {
86+
function io::run() {
8787
local cmd
8888
cmd="$(printf ' %q' "$@")"
8989
io::log_bold "${PS4}${cmd# }"

0 commit comments

Comments
 (0)