# HG changeset patch # User Chris Cannam # Date 1529418056 -3600 # Node ID 471b0fb002ea95425fca0d611d0107f988163767 # Parent ad590578bf5721a04c78ecbee614faad2f77abb2 First cut at updating archive scripts to use Repoint diff -r ad590578bf57 -r 471b0fb002ea deploy/src/archive-tip.sh --- a/deploy/src/archive-tip.sh Tue Jun 19 15:20:42 2018 +0100 +++ b/deploy/src/archive-tip.sh Tue Jun 19 15:20:56 2018 +0100 @@ -1,8 +1,18 @@ #!/bin/bash -tag=`hg id | awk '{ print $1; }'` +id=`hg id | awk '{ print $1; }'` -echo "Packaging from tag $tag..." +case "$id" in + *+) echo "ERROR: Current working copy has been modified - unmodified copy required"; exit 2;; + *);; +esac -hg archive -r"$tag" --subrepos --exclude sv-dependency-builds /tmp/sonic-visualiser-"$tag".tar.gz +echo "Packaging from id $id..." +hg update -r"$id" + +./repoint archive /tmp/sonic-visualiser-"$v".tar.gz --exclude sv-dependency-builds repoint.pri + +echo Done +echo + diff -r ad590578bf57 -r 471b0fb002ea deploy/src/archive.sh --- a/deploy/src/archive.sh Tue Jun 19 15:20:42 2018 +0100 +++ b/deploy/src/archive.sh Tue Jun 19 15:20:56 2018 +0100 @@ -6,10 +6,21 @@ v=`echo "$tag" | sed 's/sv_v//' | sed 's/_.*$//'` +current=$(hg id | awk '{ print $1; }') + +case "$current" in + *+) echo "ERROR: Current working copy has been modified - unmodified copy required so we can update to tag and back again safely"; exit 2;; + *);; +esac + echo echo -n "Packaging up version $v from tag $tag... " -hg archive -r"$tag" --subrepos --exclude sv-dependency-builds /tmp/sonic-visualiser-"$v".tar.gz +hg update -r"$tag" + +./repoint archive /tmp/sonic-visualiser-"$v".tar.gz --exclude sv-dependency-builds repoint.pri + +hg update -r"$current" echo Done echo