Cirrus: more build improvements.

Name artifact directories with the architecture type.

1 files changed, 1 insertions, 9 deletions

diff --git a/linux/make_artifacts.sh b/linux/make_artifacts.sh
index e10d5b907..6d3c48954 100644
--- a/linux/make_artifacts.sh
+++ b/linux/make_artifacts.sh
@@ -17,18 +17,10 @@ case "$MACHINE" in
   *)       ARCHITECTURE=unknown;;
 esac
 
-ARTIFACTS="$WORK/linux/artifacts"
+ARTIFACTS="$WORK/linux-${ARCHITECTURE}"
 echo "Creating $ARTIFACTS directory"
 mkdir -p $ARTIFACTS
 
-# This is our sentinel that tells us when we're done.
-rm -f $ARTIFACTS/DONE
-
-clean_up() {
-  echo "Exiting with error..."
-}
-trap clean_up EXIT
-
 echo "Copying and stripping pandoc binary"
 cp "$BINPATH" "$ARTIFACTS/pandoc"
 strip "$ARTIFACTS/pandoc"