Commit 84ffd549 authored by Robert Lyon's avatar Robert Lyon

Updating Makefile for 16.04_STABLE

Change-Id: Ia5b7b5fce561991f7f7f8de6fde021c688f1ce35
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent fdf0910c
......@@ -77,7 +77,7 @@ jenkinsaccept: minaccept
@find ./ ! -path './.git/*' -type f -print0 | xargs -0 clamscan > /dev/null && echo All good!
sshargs := $(shell git config --get remote.gerrit.url | sed -re 's~^ssh://([^@]*)@([^:]*):([0-9]*)/mahara~-p \3 -l \1 \2~')
mergebase := $(shell git fetch gerrit >/dev/null 2>&1 && git merge-base HEAD gerrit/master)
mergebase := $(shell git fetch gerrit >/dev/null 2>&1 && git merge-base HEAD gerrit/16.04_STABLE)
sha1chain := $(shell git log $(mergebase)..HEAD --pretty=format:%H | xargs)
changeidchain := $(shell git log $(mergebase)..HEAD --pretty=format:%b | grep '^Change-Id:' | cut -d' ' -f2)
......@@ -94,16 +94,16 @@ securitycheck:
push: securitycheck minaccept
@echo "Pushing the change upstream..."
@if test -z "$(TAG)"; then \
git push gerrit HEAD:refs/publish/master; \
git push gerrit HEAD:refs/publish/16.04_STABLE; \
else \
git push gerrit HEAD:refs/publish/master/$(TAG); \
git push gerrit HEAD:refs/publish/16.04_STABLE/$(TAG); \
fi
security: minaccept
@echo "Pushing the SECURITY change upstream..."
@if test -z "$(TAG)"; then \
git push gerrit HEAD:refs/drafts/master; \
git push gerrit HEAD:refs/drafts/16.04_STABLE; \
else \
git push gerrit HEAD:refs/drafts/master/$(TAG); \
git push gerrit HEAD:refs/drafts/16.04_STABLE/$(TAG); \
fi
ssh $(sshargs) gerrit set-reviewers --add \"Mahara Security Managers\" -- $(sha1chain)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment