##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: change how sockets are closed...
tests: change how sockets are closed Python 3 uses a different type to represent a socket file object than Python 2. We need to conditionalize how the socket is closed accordingly. While we're here, we switch to use socket.shutdown() to close the socket. This is because socket.close() may not actually close the socket until it is GCd. socket.shutdown() forces an immediate shutdown. I suspect Python 3 changed semantic behavior here, as I can't get test-http-bad-server.t to work with socket.close(). socket.shutdown() does appear to work, however. Differential Revision: https://phab.mercurial-scm.org/D5751
Mathias De Mare - - Load All Authors

File last commit:

r41270:4c0d4bbd default
r41605:d343d9ac default
Show More
dockerrpm
47 lines | 1.2 KiB | text/plain | TextLexer
/ contrib / packaging / dockerrpm
History | Source | Raw |Copy content |Copy permalink
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
Mathias De Mare
packaging: allow running packaging with custom uid+gid for CentOS...
 r41270 if [[ -z "${HG_DOCKER_OWN_USER}" ]]; then
DOCKERUID=1000
DOCKERGID=1000
else
DOCKERUID=$(id -u)
DOCKERGID=$(id -g)
fi
$BUILDDIR/hg-docker build --build-arg UID=$DOCKERUID --build-arg GID=$DOCKERGID $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"