Rename usages of ici_step -> ici_timed

flat-repo/flat-repo.sh

@@ -8,6 +8,6 @@ function move_files {
 	mv README.md ./*.deb ./*.yaml "$REPO_PATH/"
 }
 
-ici_step "Move files from $DEBS_PATH to $REPO_PATH" move_files
+ici_timed "Move files from $DEBS_PATH to $REPO_PATH" move_files
 ici_cmd apt-ftparchive packages . > Packages
 ici_cmd apt-ftparchive release . > Release

src/scripts/build.sh

@@ -22,7 +22,7 @@ function prepare_ws {
 
   rm -rf "$ws_path"
   mkdir -p "$ws_path"
-  ici_step "Import ROS sources into workspace" vcs import --recursive --input "$src" "$ws_path"
+  ici_timed "Import ROS sources into workspace" vcs import --recursive --input "$src" "$ws_path"
 }
 
 function build_pkg {
@@ -78,7 +78,7 @@ function build_source {
 
   prepare_ws "$ws_path" "$1"
   cd "$ws_path" || exit 1
-  ici_step "Register new packages with rosdep" register_local_pkgs_with_rosdep
+  ici_timed "Register new packages with rosdep" register_local_pkgs_with_rosdep
 
   local pkg_paths
   pkg_paths="$(colcon list --topological-order --paths-only)"
@@ -87,7 +87,7 @@ function build_source {
   total="$(echo "$pkg_paths" | wc -l)"
 
   for pkg_path in $pkg_paths; do
-    if ! ici_step "Building package $count/$total: $pkg_path" build_pkg "$pkg_path"; then
+    if ! ici_timed "Building package $count/$total: $pkg_path" build_pkg "$pkg_path"; then
       test "$CONTINUE_ON_ERROR" = false && exit 1 || FAIL_EVENTUALLY=1
     fi
     count=$((count + 1))

src/scripts/prepare.sh

@@ -18,36 +18,36 @@ ici_append EXTRA_DEB_SOURCES "deb [signed-by=$ros_key_file] http://packages.ros.
 
 # Configure sources
 ici_hook INSTALL_GPG_KEYS
-ici_step "Configure EXTRA_DEB_SOURCES" configure_extra_deb_sources
+ici_timed "Configure EXTRA_DEB_SOURCES" configure_extra_deb_sources
 
 ici_cmd restrict_src_to_packages "release o=v-launchpad-jochen-sprickerhof-de" "mmdebstrap sbuild"
-ici_step "Update apt package list" ici_asroot apt-get -qq update
+ici_timed "Update apt package list" ici_asroot apt-get -qq update
 
 # Configure apt-cacher-ng
 echo apt-cacher-ng apt-cacher-ng/tunnelenable boolean true | ici_asroot debconf-set-selections
 
 # Install packages on host
-DEBIAN_FRONTEND=noninteractive ici_step "Install packages" ici_apt_install \
+DEBIAN_FRONTEND=noninteractive ici_timed "Install packages" ici_apt_install \
 	mmdebstrap sbuild devscripts debian-archive-keyring ccache curl apt-cacher-ng \
 	python3-pip python3-rosdep python3-vcstool python3-colcon-common-extensions
 
 # Install patched bloom to handle ROS "one" distro key when resolving python and ROS version
-ici_step "Install bloom" ici_asroot pip install -U git+https://github.com/rhaschke/bloom.git@ros-one
-ici_step "rosdep init" ici_asroot rosdep init
+ici_timed "Install bloom" ici_asroot pip install -U git+https://github.com/rhaschke/bloom.git@ros-one
+ici_timed "rosdep init" ici_asroot rosdep init
 
-ici_step "check apt-cacher-ng" service apt-cacher-ng status
+ici_timed "check apt-cacher-ng" service apt-cacher-ng status
 
-ici_step "Declare EXTRA_ROSDEP_SOURCES" declare_extra_rosdep_sources
+ici_timed "Declare EXTRA_ROSDEP_SOURCES" declare_extra_rosdep_sources
 
 ici_title "Prepare build environment"
-ici_step "Create sbuild chroot" create_chroot
+ici_timed "Create sbuild chroot" create_chroot
 
-ici_step "Configure ccache" ccache --zero-stats --max-size=10.0G
+ici_timed "Configure ccache" ccache --zero-stats --max-size=10.0G
 # allow ccache access from sbuild
 chmod a+rX ~
 chmod -R a+rwX ~/.cache/ccache
 
-ici_step "Configure ~/.sbuildrc" configure_sbuildrc
+ici_timed "Configure ~/.sbuildrc" configure_sbuildrc
 
-ici_step "Create \$DEBS_PATH=$DEBS_PATH" mkdir -p "$DEBS_PATH"
-ici_step "Generate README.md" generate_readme
+ici_timed "Create \$DEBS_PATH=$DEBS_PATH" mkdir -p "$DEBS_PATH"
+ici_timed "Generate README.md" generate_readme