Skip to content

Commit

Permalink
ignore error when moving a file to itself when building deb and rpm f…
Browse files Browse the repository at this point in the history
…iles
  • Loading branch information
erratic-pattern committed Apr 17, 2023
1 parent 76480bc commit e700ad3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion xtask/scripts/build-debian-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ ${DEB_REVISION:+ --deb-revision "$DEB_REVISION" }
deb_dir="target/$TARGET/debian"
src_deb_path=$(ls "$deb_dir"/*.deb)
dest_deb_path=$(echo "$src_deb_path" | sed -E "s/${PACKAGE_VERSION}/${RELEASE_TAG}/")
mv -f "$src_deb_path" "$dest_deb_path"
mv -f "$src_deb_path" "$dest_deb_path" || true
echo "DEB_PATH=$dest_deb_path" >> "$GITHUB_ENV"
echo "DEB_NAME=$(basename "$DEB_PATH")" >> "$GITHUB_ENV"
2 changes: 1 addition & 1 deletion xtask/scripts/build-rpm-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ cargo generate-rpm \
rpm_dir="target/$TARGET/generate-rpm/"
rpm_path="${rpm_dir}/cloudtruth-${RELEASE_TAG}-1.${rpm_arch}.rpm"
# rename generated RPM to match github release name
mv -f "${rpm_dir}/cloudtruth-"*"${rpm_arch}.rpm" "${rpm_path}"
mv -f "${rpm_dir}/cloudtruth-"*"${rpm_arch}.rpm" "${rpm_path}" || true
echo "RPM_PATH=${rpm_path}" >> "$GITHUB_ENV"
echo "RPM_NAME=$(basename "$rpm_path")" >> "$GITHUB_ENV"

0 comments on commit e700ad3

Please sign in to comment.