git.iko.soy/typeable/pandoc
on master help sign in
ARM build script: more reliable detection of completion.

Previously we downloaded the tar.gz before it was complete.

commitcac796e1ab4ed170658d9056b27368e30cde3fcb authorJohn MacFarlane <jgm@berkeley.edu> dateMon 8 Mar 2021, 14:51 (6 years ago) parent31ca011
2 files changed+10−1
linux/make_artifacts.sh+9 tools/build-arm.sh+1−1
linux/make_artifacts.sh+9
@@ -11,6 +11,13 @@ esac
1111
1212ARTIFACTS="${ARTIFACTS:-/artifacts}"
1313
14+rm $ARTIFACTS/*
15+
16+clean_up() {
17+ echo "All done!" > "$ARTIFACTS/DONE"
18+}
19+trap clean_up EXIT
20+
1421# build binaries
1522
1623cabal --version
@@ -72,3 +79,5 @@ gzip -9 $TARGET/share/man/man1/pandoc.1
7279
7380tar cvzf $TARGET-linux-$ARCHITECTURE.tar.gz $TARGET
7481rm -r $TARGET
82+
83+exit 0
tools/build-arm.sh+1−1
@@ -86,7 +86,7 @@ do
8686 # print last line of log output and free memory
8787 $SSH "tail -n1 src/pandoc/docker.log && free -h | grep Mem"
8888 # Check to see if the artifact has been produced
89− $SSH "ls -l src/pandoc/linux/artifacts/*.tar.gz 2>/dev/null" && break
89+ $SSH "ls -l src/pandoc/linux/artifacts/DONE 2>/dev/null" && break
9090done
9191
9292# Retrieve the artifacts