##// END OF EJS Templates
automation: push changes affecting .hgtags...
automation: push changes affecting .hgtags When I went to build the 5.1 tag using the in-repo automation, the automatic version calculation failed to deduce the clean 5.1 version string because we had only pushed the changeset corresponding to the 5.1 tag and not the changeset containing the 5.1 tag. So from the perspective of the remote repo, the 5.1 tag didn't exist yet and automatic version deduction failed. This commit changes the `hg push` to also push all changesets affecting the .hgtags file, ensuring the remote has up-to-date tags information. I tested this by creating a local draft changeset with a dummy tag value on a different DAG head and instructed the automation to build a revision that didn't have this change to .hgtags. The tag was successfully pushed and the built package had a version number incorporating that tag. Sending this to stable so the 5.1.1 automation hopefully "just works."

File last commit:

r38804:824636b0 stable
r42911:9e0f1c80 stable
Show More
dockerdeb
40 lines | 1.3 KiB | text/plain | TextLexer
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024 #!/bin/bash -eu
Gregory Szorc
packaging: move packagelib.sh into contrib/packaging/...
r38025 . $(dirname $0)/packagelib.sh
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024
BUILDDIR=$(dirname $0)
export ROOTDIR=$(cd $BUILDDIR/../.. > /dev/null; pwd)
DISTID="$1"
CODENAME="$2"
PLATFORM="$1-$2"
shift; shift # extra params are passed to build process
OUTPUTDIR=${OUTPUTDIR:=$ROOTDIR/packages/$PLATFORM}
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476 CONTAINER=hg-docker-$PLATFORM
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476 DOCKER=$($BUILDDIR/hg-docker docker-path)
Gregory Szorc
packaging: don't write files for templatized Dockerfiles...
r38477 $BUILDDIR/hg-docker build \
--build-arg CODENAME=$CODENAME \
$BUILDDIR/docker/$DISTID.template \
$CONTAINER
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024
# debuild only appears to be able to save built debs etc to .., so we
# have to share the .. of the current directory with the docker
# container and hope it's writable. Whee.
Gregory Szorc
packaging: make packaging scripts less reliant on pwd...
r38033 dn=$(basename $ROOTDIR)
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024
Gregory Szorc
packaging: consistently create build user in Dockerfiles...
r38475 DBUILDUSER=build
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024 if [ $(uname) = "Darwin" ] ; then
$DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
sh -c "cd /mnt/$dn && make clean && make local"
fi
Gregory Szorc
packaging: make packaging scripts less reliant on pwd...
r38033 $DOCKER run -u $DBUILDUSER --rm -v $ROOTDIR/..:/mnt $CONTAINER \
Gregory Szorc
packaging: move builddeb into contrib/packaging/...
r38026 sh -c "cd /mnt/$dn && DEB_BUILD_OPTIONS='${DEB_BUILD_OPTIONS:=}' contrib/packaging/builddeb --build --distid $DISTID --codename $CODENAME $@"
Gregory Szorc
packaging: always execute builddeb from source root...
r38804 (cd $ROOTDIR && contrib/packaging/builddeb --cleanup --distid $DISTID --codename $CODENAME)
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024 if [ $(uname) = "Darwin" ] ; then
$DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
sh -c "cd /mnt/$dn && make clean"
fi