Author: mattip <matti.pi...@gmail.com>
Branch:
Changeset: r79175:fd574a88c241
Date: 2015-08-23 23:08 +0300
http://bitbucket.org/pypy/pypy/changeset/fd574a88c241/
Log: add freebsd builder to release builds, allow setting user name in
force_builds
diff --git a/pypy/doc/how-to-release.rst b/pypy/doc/how-to-release.rst
--- a/pypy/doc/how-to-release.rst
+++ b/pypy/doc/how-to-release.rst
@@ -31,15 +31,14 @@
and add the new file to pypy/doc/index-of-whatsnew.rst
* go to pypy/tool/release and run
``force-builds.py <release branch>``
- The following binaries should be built, however, we need more buildbots
- - JIT: windows, linux, os/x, armhf, armel
- - no JIT: windows, linux, os/x
- - sandbox: linux, os/x
+ The following JIT binaries should be built, however, we need more buildbots
+ windows, linux-32, linux-64, osx64, armhf-raring, armhf-raspberrian, armel,
+ freebsd64
* wait for builds to complete, make sure there are no failures
* download the builds, repackage binaries. Tag the release version
and download and repackage source from bitbucket. You may find it
- convenient to use the ``repackage.sh`` script in pypy/tools to do this.
+ convenient to use the ``repackage.sh`` script in pypy/tool/release to do
this.
Otherwise repackage and upload source "-src.tar.bz2" to bitbucket
and to cobra, as some packagers prefer a clearly labeled source package
diff --git a/pypy/tool/release/force-builds.py
b/pypy/tool/release/force-builds.py
--- a/pypy/tool/release/force-builds.py
+++ b/pypy/tool/release/force-builds.py
@@ -28,6 +28,7 @@
# 'pypy-c-app-level-win-x86-32',
'pypy-c-jit-linux-x86-32',
'pypy-c-jit-linux-x86-64',
+ 'pypy-c-jit-freebsd-9-x86-64',
'pypy-c-jit-macosx-x86-64',
'pypy-c-jit-win-x86-32',
'build-pypy-c-jit-linux-armhf-raring',
@@ -42,7 +43,7 @@
import pwd
return pwd.getpwuid(os.getuid())[0]
-def main(branch, server):
+def main(branch, server, user):
#XXX: handle release tags
#XXX: handle validity checks
lock = defer.DeferredLock()
@@ -56,7 +57,7 @@
print 'Forcing', builder, '...'
url = "http://"; + server + "/builders/" + builder + "/force"
args = [
- ('username', get_user()),
+ ('username', user),
('revision', ''),
('forcescheduler', 'Force Scheduler'),
('submit', 'Force Build'),
@@ -78,7 +79,8 @@
parser = optparse.OptionParser()
parser.add_option("-b", "--branch", help="branch to build", default='')
parser.add_option("-s", "--server", help="buildbot server",
default="buildbot.pypy.org")
+ parser.add_option("-u", "--user", help="user name to report",
default=get_user())
(options, args) = parser.parse_args()
if not options.branch:
parser.error("branch option required")
- main(options.branch, options.server)
+ main(options.branch, options.server, user=options.user)
diff --git a/pypy/tool/release/repackage.sh b/pypy/tool/release/repackage.sh
--- a/pypy/tool/release/repackage.sh
+++ b/pypy/tool/release/repackage.sh
@@ -1,12 +1,12 @@
# Edit these appropriately before running this script
maj=2
min=6
-rev=0
+rev=1
# This script will download latest builds from the buildmaster, rename the top
# level directory, and repackage ready to be uploaded to bitbucket. It will
also
# download source, assuming a tag for the release already exists, and
repackage them.
-for plat in linux linux64 linux-armhf-raspbian linux-armhf-raring linux-armel
osx64
+for plat in linux linux64 linux-armhf-raspbian linux-armhf-raring linux-armel
osx64 freebsd64
do
wget
http://buildbot.pypy.org/nightly/release-$maj.$min.x/pypy-c-jit-latest-$plat.tar.bz2
tar -xf pypy-c-jit-latest-$plat.tar.bz2
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
