Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix all branches of push running needlessly due to .events/dist dependency.

Browse Source
This commit is contained in:
ccd0 2016-04-17 03:12:01 -07:00
parent 569e59ddc9
commit 18193312cb
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -229,17 +229,16 @@ dist :
$(wildcard dist/* dist/*/*) : dist $(wildcard dist/* dist/*/*) : dist
.events/dist : dist $(wildcard dist/* dist/*/*) distready : dist $(wildcard dist/* dist/*/*)
cd dist && git checkout $(distBranch) cd dist && git checkout $(distBranch)
cd dist && git pull cd dist && git pull
echo -> $@
.events2/push-git : .events/dist .git/refs/heads .git/refs/tags $(wildcard .git/refs/heads/* .git/refs/tags/*) | .events2 .events2/push-git : .git/refs/heads .git/refs/tags $(wildcard .git/refs/heads/* .git/refs/tags/*) | .events2 distready
git push origin --tags -f git push origin --tags -f
git push origin --all git push origin --all
echo -> $@ echo -> $@
.events2/push-web : .events/dist .git/refs/heads/$(distBranch) | .events2 .events2/push-web : .git/refs/heads/$(distBranch) | .events2 distready
aws s3 cp builds/ s3://$(awsBucket)/builds/ --recursive --exclude "*" --include "*.js" --cache-control "max-age=600" --content-type "application/javascript; charset=utf-8" aws s3 cp builds/ s3://$(awsBucket)/builds/ --recursive --exclude "*" --include "*.js" --cache-control "max-age=600" --content-type "application/javascript; charset=utf-8"
aws s3 cp builds/ s3://$(awsBucket)/builds/ --recursive --exclude "*" --include "*.crx" --cache-control "max-age=600" --content-type "application/x-chrome-extension" aws s3 cp builds/ s3://$(awsBucket)/builds/ --recursive --exclude "*" --include "*.crx" --cache-control "max-age=600" --content-type "application/x-chrome-extension"
aws s3 cp builds/ s3://$(awsBucket)/builds/ --recursive --exclude "*" --include "*.xml" --cache-control "max-age=600" --content-type "text/xml; charset=utf-8" aws s3 cp builds/ s3://$(awsBucket)/builds/ --recursive --exclude "*" --include "*.xml" --cache-control "max-age=600" --content-type "text/xml; charset=utf-8"
@ -249,13 +248,13 @@ $(wildcard dist/* dist/*/*) : dist
aws s3 cp web.css s3://$(awsBucket) --cache-control "max-age=600" --content-type "text/css; charset=utf-8" aws s3 cp web.css s3://$(awsBucket) --cache-control "max-age=600" --content-type "text/css; charset=utf-8"
echo -> $@ echo -> $@
.events2/push-store : .events/dist .git/refs/tags/stable | .events2 .events2/push-store : .git/refs/tags/stable | .events2 distready
node tools/webstore.js node tools/webstore.js
echo -> $@ echo -> $@
.SECONDARY : .SECONDARY :
.PHONY: default all script crx release jshint install push $(npgoals) .PHONY: default all distready script crx release jshint install push $(npgoals)
script : $(script) script : $(script)
@ -292,20 +291,20 @@ $(foreach i,1 2 3 4,bump$(i)) : cleanrel
$(MAKE) all $(MAKE) all
$(MAKE) tag $(MAKE) tag
beta : .events/dist beta : distready
git tag -af beta -m "$(nameHuman) v$(version)." git tag -af beta -m "$(nameHuman) v$(version)."
cd dist && git merge --no-commit -s ours beta cd dist && git merge --no-commit -s ours beta
cd dist && git checkout beta "builds/*-beta.*" LICENSE CHANGELOG.md img .gitignore .gitattributes cd dist && git checkout beta "builds/*-beta.*" LICENSE CHANGELOG.md img .gitignore .gitattributes
cd dist && git commit -am "Move $(nameHuman) v$(version) to beta channel." cd dist && git commit -am "Move $(nameHuman) v$(version) to beta channel."
stable : .events/dist stable : distready
git push . HEAD:bstable git push . HEAD:bstable
git tag -af stable -m "$(nameHuman) v$(version)." git tag -af stable -m "$(nameHuman) v$(version)."
cd dist && git merge --no-commit -s ours stable cd dist && git merge --no-commit -s ours stable
cd dist && git checkout stable "builds/$(name).*" builds/updates.xml cd dist && git checkout stable "builds/$(name).*" builds/updates.xml
cd dist && git commit -am "Move $(nameHuman) v$(version) to stable channel." cd dist && git commit -am "Move $(nameHuman) v$(version) to stable channel."
web : index.html .events/dist web : index.html distready
-git commit -am "Build web page." -git commit -am "Build web page."
cd dist && git merge --no-commit -s ours master cd dist && git merge --no-commit -s ours master
cd dist && git checkout master README.md index.html web.css img cd dist && git checkout master README.md index.html web.css img