Skip to content

Fix deploy.json creation #888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asbiin merged 9 commits into from
Feb 8, 2018
Merged

Fix deploy.json creation #888

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f409c48
Build and deploy assets on travis
asbiin Feb 5, 2018
60c925f
Remove this old font not used anymore
asbiin Feb 5, 2018
a333129
Fix before_install condition
asbiin Feb 5, 2018
9ceb9d1
Add update command, and update contribute doc
asbiin Feb 7, 2018
1a6d1ce
Fix deploy.json creation
asbiin Feb 8, 2018
a594342
Merge branch 'master' into features/800-deploy-assets
asbiin Feb 8, 2018
edb824e
Try with a comment with special chars (),/,"voilà"
asbiin Feb 8, 2018
8347eb1
Merge branch 'features/800-deploy-assets' of github.com:monicahq/moni…
asbiin Feb 8, 2018
3239a02
Try with a comment with special chars (),/,"voilà"
asbiin Feb 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,17 @@ $(ASSETS):

dist: results/$(DESTDIR).tar.bz2 results/$(ASSETS).tar.bz2 .travis.deploy.json

COMMIT_MESSAGE := $(shell echo "$$TRAVIS_COMMIT_MESSAGE" | sed -s 's/"/\\\\\\\\\\"/g' | sed -s 's/(/\\(/g' | sed -s 's/)/\\)/g' | sed -s 's%/%\\/%g')

.travis.deploy.json: .travis.deploy.json.in
sed -s "s/\$$(version)/$(BUILD)/" $< | \
sed -s "s/\$$(description)/$(subst ",\\\\\",$(TRAVIS_COMMIT_MESSAGE))/" | \
sed -s "s/\$$(released)/$(shell date --iso-8601=date)/" | \
sed -s "s/\$$(travis_tag)/$(TRAVIS_TAG)/" | \
sed -s "s/\$$(travis_commit)/$(GIT_COMMIT)/" | \
sed -s "s/\$$(travis_build_number)/$(TRAVIS_BUILD_NUMBER)/" | \
sed -s "s/\$$(date)/$(shell date --iso-8601=s)/" > $@
cp $< $@
sed -si "s/\$$(version)/$(BUILD)/" $@
sed -si "s/\$$(description)/$(COMMIT_MESSAGE)/" $@
sed -si "s/\$$(released)/$(shell date --iso-8601=date)/" $@
sed -si "s/\$$(travis_tag)/$(TRAVIS_TAG)/" $@
sed -si "s/\$$(travis_commit)/$(GIT_COMMIT)/" $@
sed -si "s/\$$(travis_build_number)/$(TRAVIS_BUILD_NUMBER)/" $@
sed -si "s/\$$(date)/$(shell date --iso-8601=s)/" $@

results/%.tar.xz: % prepare
tar chfJ $@ --exclude .gitignore --exclude .gitkeep $<
Expand Down Expand Up @@ -142,3 +145,4 @@ update: .env build-dev
cp .env.example .env

.PHONY: dist clean fullclean install update build prepare build-prod build-dev