This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 9c2db5ad92dd6b3eedafa9bdb2706ed660ef071d (commit)
via ae110f532e31c22e94b1758d6f0b4747782ba634 (commit)
via 31cbb5c9e86dd396df940f8ffab87359804b2dd5 (commit)
via 12241660eeeba9d2c9d541b734ae12c4de7b4525 (commit)
via 76f60cdc06dd1a7defdaa8faec51170c69293d00 (commit)
via 447fc0f16fefec8d8b91041a1cb6c3143ec2f9d8 (commit)
via 6ee6928fdd7721ecc086aae477eb6a8a2a4f654c (commit)
via e36a4c7fb12bd42e743720165d89b8ab05c6b5e4 (commit)
from ee8d4868ce56a8c787d8595c042d07e77ef76b2f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9c2db5ad92dd6b3eedafa9bdb2706ed660ef071d
Merge: ee8d486 ae110f5
Author: Roland Mas <[email protected]>
Date: Mon Jun 1 13:01:16 2015 +0200
Merge branch '6.0'
-----------------------------------------------------------------------
Summary of changes:
src/debian/fusionforge-common.docs | 2 +-
tests/buildbot/fusionforge-build-and-test.sh | 3 +-
tests/buildbot/push-packages-to-repositories.sh | 42 +++++++++++++++++++++++++
3 files changed, 45 insertions(+), 2 deletions(-)
create mode 100644 tests/buildbot/push-packages-to-repositories.sh
diff --git a/src/debian/fusionforge-common.docs
b/src/debian/fusionforge-common.docs
index 1122c5a..93e40c4 100644
--- a/src/debian/fusionforge-common.docs
+++ b/src/debian/fusionforge-common.docs
@@ -1,5 +1,5 @@
README
AUTHORS
-CHANGES
docs/README.Themes
docs/README.Plugins
+# CHANGES -> automatically installed as changelog.gz
diff --git a/tests/buildbot/fusionforge-build-and-test.sh
b/tests/buildbot/fusionforge-build-and-test.sh
index 80dc556..370450e 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -101,7 +101,8 @@ copy_logs
if [ $retcode = 0 ] ; then
case $INSTALL_METHOD in
deb)
- rsync -av --delete root@$HOST:/usr/src/debian-repository/local/
$WORKSPACE/packages/
+ cd $WORKSPACE/packages/
+ rsync -av --delete root@$HOST:/usr/src/debian-repository/local/ ./
;;
rpm)
rsync -av --delete root@$HOST:/usr/src/fusionforge/build/RPMS/
$WORKSPACE/packages/
diff --git a/tests/buildbot/push-packages-to-repositories.sh
b/tests/buildbot/push-packages-to-repositories.sh
new file mode 100644
index 0000000..ecd63d5
--- /dev/null
+++ b/tests/buildbot/push-packages-to-repositories.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+set -e
+
+os=$1
+method=$2
+branch=$(echo $GIT_BRANCH | sed -e s,origin/,, -e s,/,_,g)
+
+case $os in
+ debian7)
+ dist=wheezy
+ ;;
+ debian8)
+ dist=jessie
+ ;;
+ centos*)
+ dist=$os
+ ;;
+ *)
+ echo "Unknown OS"
+ exit 1
+ ;;
+esac
+
+case $method in
+ src)
+ echo "No packages to handle"
+ exit 0
+ ;;
+ deb)
+ cd $WORKSPACE/packages/
+ sed -i -e "s/^Distribution:.*/Distribution: $dist-$branch/"
fusionforge*changes
+ dput fforg fusionforge*changes
+ ;;
+ rpm)
+ rsync -av --delete $WORKSPACE/packages/
[email protected]:/home/groups/fusionforge/htdocs/rpm/$dist-$branch/
+ ;;
+ *)
+ echo "Unknown install method"
+ exit 1
+ ;;
+esac
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
