Commit d2894db1 authored by Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic
Browse files

update Makefile branch name

Change-Id: I8e7ad8792f3a6a91f44f81f20e2303a466d81190
parent 53d5b7fc
...@@ -111,7 +111,7 @@ jenkinsaccept: minaccept ...@@ -111,7 +111,7 @@ jenkinsaccept: minaccept
@find ./ ! -path './.git/*' -type f -print0 | xargs -0 clamscan > /dev/null && echo All good! @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~') 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/18.10_STABLE)
sha1chain := $(shell git log $(mergebase)..HEAD --pretty=format:%H | xargs) 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) changeidchain := $(shell git log $(mergebase)..HEAD --pretty=format:%b | grep '^Change-Id:' | cut -d' ' -f2)
...@@ -128,16 +128,16 @@ securitycheck: ...@@ -128,16 +128,16 @@ securitycheck:
push: securitycheck minaccept push: securitycheck minaccept
@echo "Pushing the change upstream..." @echo "Pushing the change upstream..."
@if test -z "$(TAG)"; then \ @if test -z "$(TAG)"; then \
git push gerrit HEAD:refs/publish/master; \ git push gerrit HEAD:refs/publish/18.10_STABLE; \
else \ else \
git push gerrit HEAD:refs/publish/master/$(TAG); \ git push gerrit HEAD:refs/publish/18.10_STABLE/$(TAG); \
fi fi
security: minaccept security: minaccept
@echo "Pushing the SECURITY change upstream..." @echo "Pushing the SECURITY change upstream..."
@if test -z "$(TAG)"; then \ @if test -z "$(TAG)"; then \
git push gerrit HEAD:refs/drafts/master; \ git push gerrit HEAD:refs/drafts/18.10_STABLE; \
else \ else \
git push gerrit HEAD:refs/drafts/master/$(TAG); \ git push gerrit HEAD:refs/drafts/18.10_STABLE/$(TAG); \
fi fi
ssh $(sshargs) gerrit set-reviewers --add \"Mahara Security Managers\" -- $(sha1chain) 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