##// END OF EJS Templates
rebase: in --confirm option just abort if hit a conflict...
rebase: in --confirm option just abort if hit a conflict Before this patch, it was prompting the user in both cases 1) when there is no conflict 2) when there is at least one conflict. But for simplicity we can just abort if we hit a conflict and no need to prompt in that case. Differential Revision: https://phab.mercurial-scm.org/D3944

File last commit:

r38476:e5916f12 default
r38701:b3d0c97a @81 default
Show More
dockerrpm
39 lines | 1.1 KiB | text/plain | TextLexer
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024 #!/bin/bash -e
BUILDDIR=$(dirname $0)
export ROOTDIR=$(cd $BUILDDIR/../..; pwd)
PLATFORM="$1"
shift # extra params are passed to buildrpm
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476 DOCKER=$($BUILDDIR/hg-docker docker-path)
CONTAINER=hg-docker-$PLATFORM
$BUILDDIR/hg-docker build $BUILDDIR/docker/$PLATFORM $CONTAINER
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024
RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM
Gregory Szorc
packaging: make packaging scripts less reliant on pwd...
r38033 $ROOTDIR/contrib/packaging/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $*
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024
DSHARED=/mnt/shared
Gregory Szorc
packaging: consistently create build user in Dockerfiles...
r38475 DBUILDUSER=build
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024 $DOCKER run -e http_proxy -e https_proxy -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \
rpmbuild --define "_topdir $DSHARED" -ba $DSHARED/SPECS/mercurial.spec --clean
$DOCKER run -e http_proxy -e https_proxy -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \
createrepo $DSHARED
cat << EOF > $RPMBUILDDIR/mercurial.repo
# Place this file in /etc/yum.repos.d/mercurial.repo
[mercurial]
name=Mercurial packages for $PLATFORM
# baseurl=file://$RPMBUILDDIR/
baseurl=http://hg.example.com/build/$PLATFORM/
skip_if_unavailable=True
gpgcheck=0
enabled=1
EOF
echo
echo "Build complete - results can be found in $RPMBUILDDIR"