Author: tchemit Date: 2015-12-15 08:43:00 +0100 (Tue, 15 Dec 2015) New Revision: 129 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/129 Log: Mise ?\195?\160 jour des scripts post-receive pour les depot git sur la forge Modified: scripts/redmine-tools/redmine-post-commit-git-with-repoid.sh scripts/redmine-tools/redmine-post-commit.sh Modified: scripts/redmine-tools/redmine-post-commit-git-with-repoid.sh =================================================================== --- scripts/redmine-tools/redmine-post-commit-git-with-repoid.sh 2015-12-15 07:42:27 UTC (rev 128) +++ scripts/redmine-tools/redmine-post-commit-git-with-repoid.sh 2015-12-15 07:43:00 UTC (rev 129) @@ -10,15 +10,23 @@ # refresh redmine scm viewer curl -s "http://forge.$DOMAIN/sys/fetch_changesets?key=$SCM_API_KEY&id=$PROJECT_NAME" &> /dev/null +#echo "Redmine notified" + # send post-commit email (cd /var/lib/git/git-$DOMAIN/$REPO_ID.git ; python /opt/git-tools/git-multimail-run.py) -DEPLOY_DEMO=$( git config -f /var/lib/git/git-$DOMAIN/$REPO_ID.git/config --get --bool nightlybuild.deploy-latest-to-demo ) -if [ "$DEPLOY_DEMO" = "true" ] ; then - touch /var/cache/redmine/nightly-build/$DOMAIN/$REPO_ID.deploy-demo && chmod o+w /var/cache/redmine/nightly-build/$DOMAIN/$REPO_ID.deploy-demo -fi - -DEPLOY_SITE=$( git config -f /var/lib/git/git-$DOMAIN/$REPO_ID.git/config --get --bool nightlybuild.deploy-snapshot-site ) -if [ "$DEPLOY_SITE" = "true" ] ; then - touch /var/cache/redmine/nightly-build/$DOMAIN/$REPO_ID.site -fi +#echo "Mail sent" +# +#DEPLOY_DEMO=$( git config -f /var/lib/git/git-$DOMAIN/$REPO_ID.git/config --get --bool nightlybuild.deploy-latest-to-demo ) +#if [ "$DEPLOY_DEMO" = "true" ] ; then +# touch /var/cache/redmine/nightly-build/$DOMAIN/$REPO_ID.deploy-demo && chmod o+w /var/cache/redmine/nightly-build/$DOMAIN/$REPO_ID.deploy-demo +#fi +# +#echo "Deploy demo's touch done" +# +#DEPLOY_SITE=$( git config -f /var/lib/git/git-$DOMAIN/$REPO_ID.git/config --get --bool nightlybuild.deploy-snapshot-site ) +#if [ "$DEPLOY_SITE" = "true" ] ; then +# touch /var/cache/redmine/nightly-build/$DOMAIN/$REPO_ID.site +#fi +# +#echo "Deploy site's touch done" Modified: scripts/redmine-tools/redmine-post-commit.sh =================================================================== --- scripts/redmine-tools/redmine-post-commit.sh 2015-12-15 07:42:27 UTC (rev 128) +++ scripts/redmine-tools/redmine-post-commit.sh 2015-12-15 07:43:00 UTC (rev 129) @@ -18,7 +18,7 @@ /opt/redmine-tools/commit-email.pl -h users.$MAIL_DOMAIN "$REPOS" "$REV" $PROJECT_NAME-commits@list.$MAIL_DOMAIN # refresh redmine svn viewer -wget "http://forge.$DOMAIN/sys/fetch_changesets?key=$SVN_API_KEY" --spider & +wget "http://forge.$DOMAIN/sys/fetch_changesets?id=$PROJECT_NAME&key=$SVN_API_KEY" --spider & # touch project for nightly build touch /var/cache/redmine/nightly-build/$DOMAIN/$PROJECT_NAME.site