common_cleanup()

Author: rhaschke

src/build.sh

@@ -194,6 +194,46 @@ function get_package_release_version {
   echo "$version-$offset$DEB_DISTRO"
 }
 
+# common cleanup tasks after building a package
+function common_cleanup {
+  local exit_code=$1
+  local deb_pkg_name=$2
+  local src_folder=${3:-..}
+
+  ici_label pwd
+  ici_label ls -1lt ..
+  ici_label ls -1lt ../log
+  ici_label ls -1lt "$DEBS_PATH"
+
+  ## Rename .build log file, which has invalid characters (:) for artifact upload
+  local log;
+  # shellcheck disable=SC2010
+  log=$(ls -1t "$DEBS_PATH/$(deb_pkg_name "${pkg_name}")*.build" | grep -P '(?<!Z)\.build' | head -1)
+  ici_log "log file: $log $(readlink -f "$log")"
+  mv "$(readlink -f "$log")" "${log/.build/.log}" # rename actual log file
+  rm -f "$log" # remove symlink
+
+  if [ "$exit_code" != 0 ] ; then
+    # remove source files if the build failed
+    rm -f "$src_folder"/*.{dsc,tar.*}
+    return "$exit_code"
+  fi
+  # Move .dsc + .tar.* files from src_folder to $DEBS_PATH for deployment
+  mv "$src_folder"/*.{dsc,tar.*} "$DEBS_PATH"
+
+  BUILT_PACKAGES+=("$((idx+1))/$total $deb_pkg_name: $(source_link "${version%"$DEB_DISTRO"}")")
+
+  if [ "$INSTALL_TO_CHROOT" == "true" ]; then
+    ici_color_output BOLD "Install package within chroot"
+    # shellcheck disable=SC2012
+    cat <<- EOF | "${APT_QUIET[@]}" ici_pipe_into_schroot sbuild-rw
+      DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -q -y \$(ls -1 -t /build/repo/"$deb_pkg_name"*.deb | head -1)
+EOF
+  fi
+
+  ici_label update_repo
+}
+
 function build_pkg {
   local old_path=$PWD
   local pkg_name=$1
@@ -217,8 +257,6 @@ function build_pkg {
   rosdep install --os="$DISTRIBUTION:$DEB_DISTRO" --simulate -t build -t buildtool_export -t buildtool -t build_export -t exec --from-paths . > /dev/null || return 2
   ici_label "${BLOOM_QUIET[@]}" bloom-generate "${BLOOM_GEN_CMD}" --os-name="$DISTRIBUTION" --os-version="$DEB_DISTRO" --ros-distro="$ROS_DISTRO" --skip-test-dependencies --skip-pip || return 2
 
-  trap 'rm -f ../*.dsc ../*.tar.gz; cd "$old_path"' RETURN # cleanup on build failure
-
   # Enable CATKIN_INSTALL_INTO_PREFIX_ROOT for catkin package
   if [ "$pkg_name" = "catkin" ]; then
     sed -i 's@-DCATKIN_BUILD_BINARY_PACKAGE="1"@-DCATKIN_INSTALL_INTO_PREFIX_ROOT="1"@' debian/rules
@@ -241,9 +279,6 @@ function build_pkg {
   debchange -v "$version_stamped" \
     --preserve -m "Append timestamp when binarydeb was built." || return 3
 
-  local version_link; version_link=$(source_link "${version%"$DEB_DISTRO"}") || true
-  rm -rf .git
-
   # Fetch sbuild options from .repos yaml file
   opts=""
   if [ -f "$WS_SOURCE" ]; then
@@ -255,54 +290,8 @@ function build_pkg {
 
   ici_log
   SBUILD_OPTS="--verbose --chroot=sbuild --no-clean-source --no-run-lintian --dist=$DEB_DISTRO $opts"
-  ici_label "${SBUILD_QUIET[@]}" ici_asroot -E -H -u "$USER" bash -lc "sbuild $SBUILD_OPTS" || return 4
-
-  "${CCACHE_QUIET[@]}" ici_label ccache -sv || return 1
-  BUILT_PACKAGES+=("$((idx+1))/$total $(deb_pkg_name "$pkg_name"): $version_link")
-
-  if [ "$INSTALL_TO_CHROOT" == "true" ]; then
-    ici_color_output BOLD "Install package within chroot"
-    # shellcheck disable=SC2012
-    cat <<- EOF | "${APT_QUIET[@]}" ici_pipe_into_schroot sbuild-rw
-      DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -q -y \$(ls -1 -t /build/repo/"$(deb_pkg_name "$pkg_name")"*.deb | head -1)
-EOF
-  fi
-  # Move .dsc + .tar.gz files from workspace folder to $DEBS_PATH for deployment
-  mv ../*.dsc ../*.tar.gz "$DEBS_PATH"
-  trap 'cd "$old_path"' RETURN # cleanup on return
-
-  ## Rename .build log file, which has invalid characters (:) for artifact upload
-  local log;
-  # shellcheck disable=SC2010
-  log=$(ls -1t "$DEBS_PATH/$(deb_pkg_name "${pkg_name}" "$version_stamped")_"*.build | grep -P '(?<!Z)\.build' | head -1)
-  mv "$(readlink -f "$log")" "${log/.build/.log}" # rename actual log file
-  rm "$log" # remove symlink
-
-  ici_label update_repo
-}
-
-function get_git_release_version {
-  local version
-  local sha
-  local offset="0"
-
-  git rev-parse --is-inside-work-tree &> /dev/null || return 1
-
-  # Get version from preceding tag, stripping any prefix or suffix not contributing to x.y.z version string
-  version=$(git describe --tags --abbrev=0 2>/dev/null | sed -E 's@^.*?[^0-9]([0-9]+\.[0-9]+\.[0-9]+).*$@\1@')
-  if [ -n "$version" ]; then
-    # Get sha from this tag
-    sha=$(git rev-list --tags --max-count=1)
-  else # no tag available
-    # extract sha + version from latest version-like commit message instead
-    version=$(git log --pretty=format:'%h %s' | grep -E "^.*?[^0-9]([0-9]+\.[0-9]+\.[0-9]+).*$" | head -n 1)
-    sha=$(echo "$version" | awk '{print $1}')
-    version=$(echo "$version"  | sed -E 's@^.*?[^0-9]([0-9]+\.[0-9]+\.[0-9]+).*$@\1@')
-  fi
-  # commit offset from version to HEAD
-  offset="$(git rev-list --count "$sha"..HEAD)"
-
-  echo "$version-$offset$DEB_DISTRO"
+  ici_label "${SBUILD_QUIET[@]}" ici_asroot -E -H -u "$USER" bash -lc "sbuild $SBUILD_OPTS"
+  common_cleanup $? "$(deb_pkg_name "$pkg_name")"
 }
 
 function sbuild_pkg {
@@ -328,9 +317,6 @@ function sbuild_pkg {
   debchange --create --package "$deb_pkg_name" -v "$version_stamped" \
     --preserve -m "$deb_pkg_name ${version%"$DEB_DISTRO"} release" || return 3
 
-  local version_link; version_link=$(source_link "${version%"$DEB_DISTRO"}") || true
-  rm -rf .git
-
   # Fetch sbuild options from .repos yaml file
   opts=""
   if [ -f "$WS_SOURCE" ]; then
@@ -343,21 +329,7 @@ function sbuild_pkg {
   ici_log
   SBUILD_OPTS="--verbose --chroot=sbuild --no-clean-source --no-run-lintian --dist=$DEB_DISTRO $opts"
   ici_label "${SBUILD_QUIET[@]}" ici_asroot -E -H -u "$USER" bash -lc "sbuild $SBUILD_OPTS" || return 4
-
-  "${CCACHE_QUIET[@]}" ici_label ccache -sv || return 1
-  BUILT_PACKAGES+=("$((idx+1))/$total $deb_pkg_name: $version_link")
-
-  if [ "$INSTALL_TO_CHROOT" == "true" ]; then
-    ici_color_output BOLD "Install package within chroot"
-    # shellcheck disable=SC2012
-    cat <<- EOF | "${APT_QUIET[@]}" ici_pipe_into_schroot sbuild-rw
-      DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -q -y \$(ls -1 -t /build/repo/"$(deb_pkg_name "$pkg_name")"*.deb | head -1)
-EOF
-  fi
-  # Move .dsc + .tar.gz files from workspace folder to $DEBS_PATH for deployment
-  mv ../*.dsc ../*.tar.gz "$DEBS_PATH"
-
-  ici_label update_repo
+  common_cleanup $? "$deb_pkg_name"
 }
 
 function get_python_release_version {
@@ -397,17 +369,13 @@ function build_python_pkg {
   local deb_pkg_name; deb_pkg_name="python3-$(python3 setup.py --name)"
   pkg_exists "$deb_pkg_name" "$version" && return
 
-  local version_link; version_link=$(source_link "${version%"$DEB_DISTRO"}") || true
-  rm -rf .git
-
   ici_label "${SBUILD_QUIET[@]}" python3 setup.py --command-packages=stdeb.command sdist_dsc --debian-version "$debian_version" bdist_deb || return 4
+  local err=$?
 
-  BUILT_PACKAGES+=("$((idx+1))/$total $deb_pkg_name: $version_link")
-
-  # Move created files to $DEBS_PATH for deployment
-  mv deb_dist/*.dsc deb_dist/*.tar.?z deb_dist/*.deb deb_dist/*.changes deb_dist/*.buildinfo "$DEBS_PATH"
+  # Move created files (except source distro) to $DEBS_PATH for deployment
+  mv deb_dist/*.deb deb_dist/*.changes deb_dist/*.buildinfo "$DEBS_PATH"
 
-  ici_label update_repo
+  common_cleanup "$err" "$deb_pkg_name" deb_dist
 }
 
 function known_to_fail {

src/scripts/deploy.sh

@@ -21,7 +21,7 @@ function cleanup_debs {
 	ici_step update_readme "$repo_url"
 	cd "$DEBS_PATH" || return 1
 
-	local remove_files=("./*.deb" "./*.ddeb" "./*.dsc" "./*.tar.gz" "./*.buildinfo" "./*.changes" "./*.log")
+	local remove_files=("./*.deb" "./*.ddeb" "./*.dsc" "./*.tar.*" "./*.buildinfo" "./*.changes" "./*.log")
 	for file in $DEPLOY_FILES; do # don't delete file type if listed in DEPLOY_FILES
 		remove_files=( "${remove_files[@]/"./*.${file##*.}"}" )
 	done

src/util.sh

@@ -639,7 +639,6 @@ function ici_parse_url {
 export DEFAULT_QUIET_CONFIG=( \
 	"bloom:BLOOM_QUIET:ici_quiet" \
 	"sbuild:SBUILD_QUIET:ici_quiet" \
-	"ccache:CCACHE_QUIET:ici_quiet" \
 	"apt:APT_QUIET:ici_filter \"Setting up\"" \
 )
 function ici_setup_vars {

test/util.bats

@@ -226,20 +226,17 @@ EOF
 	ici_setup_vars "" "${DEFAULT_QUIET_CONFIG[@]}"
 	[ "${#BLOOM_QUIET[@]}" = 1 ] && [ "${BLOOM_QUIET[0]}" = ici_quiet ]
 	[ "${#SBUILD_QUIET[@]}" = 1 ] && [ "${SBUILD_QUIET[0]}" = ici_quiet ]
-	[ "${#CCACHE_QUIET[@]}" = 1 ] && [ "${CCACHE_QUIET[0]}" = ici_quiet ]
 	[ "${#APT_QUIET[@]}" = 2 ] && [ "${APT_QUIET[0]}" = ici_filter ] && [ "${APT_QUIET[1]}" = "Setting up" ]
 }
 @test ici_setup_vars_verbose {
 	ici_setup_vars "true" "${DEFAULT_QUIET_CONFIG[@]}"
 	[ "${#BLOOM_QUIET[@]}" = 0 ]
 	[ "${#SBUILD_QUIET[@]}" = 0 ]
-	[ "${#CCACHE_QUIET[@]}" = 0 ]
 	[ "${#APT_QUIET[@]}" = 0 ]
 }
 @test ici_setup_vars_selected {
 	ici_setup_vars "bloom sbuild ccache apt" "${DEFAULT_QUIET_CONFIG[@]}"
 	[ "${#BLOOM_QUIET[@]}" = 0 ]
 	[ "${#SBUILD_QUIET[@]}" = 0 ]
-	[ "${#CCACHE_QUIET[@]}" = 0 ]
 	[ "${#APT_QUIET[@]}" = 0 ]
 }