travis: Small cleanup of new subversion support.

timvideos · Jan 18, 2018 · 2a9ff93 · 2a9ff93
1 parent 7f3831e
commit 2a9ff93
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/.travis/build.sh b/.travis/build.sh
@@ -217,15 +217,16 @@ function build() {
 	# Save the resulting binaries into the prebuilt repo. The gateware
 	# should always exist, but others might not.
 	if [ -d "$PREBUILT_DIR" ]; then
-		COPY_DEST="$PREBUILT_DIR/archive/$GIT_REVISION/$FULL_PLATFORM/$TARGET/$FULL_CPU/"
-
-		svn mkdir --parents $COPY_DEST
 		echo ""
 		echo ""
 		echo ""
-		echo "- Adding built files to $(cd $COPY_DEST; git remote get-url origin)"
+		echo "- Adding built files to $(cd $COPY_DEST; svn info | grep "Repository Root:")"
 		echo "---------------------------------------------"
 
+		COPY_DEST="$PREBUILT_DIR/archive/$GIT_REVISION/$FULL_PLATFORM/$TARGET/$FULL_CPU/"
+
+		svn mkdir --parents $COPY_DEST
+
 		declare -a SAVE
 		SAVE+="image*.bin" 				# Combined binary include gateware+bios+firmware
 		# Gateware output for using
@@ -260,6 +261,8 @@ function build() {
 		cp $TARGET_BUILD_DIR/software/firmware/version_data.c $COPY_DEST/logs/version_data.c
 		cp $TARGET_BUILD_DIR/output.*.log $COPY_DEST/logs/
 
+		find $COPY_DEST -empty -delete
+
 		(
 		cd $COPY_DEST
 		sha256sum $(find -type f) > sha256sum.txt