Skip to content
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

Fix/travis and bintray #206

Merged
merged 4 commits into from
Apr 5, 2016
Merged

Fix/travis and bintray #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c91fed
releasing v1.9.2
Halleck45 Mar 20, 2016
adf4056
added bintray.json in process of releasing
Halleck45 Mar 20, 2016
1370396
minor change in HTML report: footer is fixed
Halleck45 Mar 22, 2016
148a4b2
fixed an error in travis with bintray deploy
Halleck45 Mar 22, 2016
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
7 changes: 3 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@ before_script:
script:
- make test

after_script:
- make build

before_deploy:
- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && apt-get install -qq -y ruby2.1 && gem install semver'
- apt-get install -qq -y ruby2.1 && gem install semver'
- make build

deploy:
provider: bintray
Expand All @@ -34,6 +32,7 @@ deploy:
on:
branch: master
php: '5.6'
skip_cleanup: true

env:
global:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ tag:

# Tag git with last release
release:
git add .semver build/phpmetrics.phar bin/phpmetrics templates/html/version.html.twig
git add .semver build/phpmetrics.phar bin/phpmetrics templates/html/version.html.twig artifacts/bintray.json
git commit -m "releasing `semver tag`"
git tag `semver tag`
git push -u origin master
Expand Down
6 changes: 3 additions & 3 deletions artifacts/bintray.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
"licenses": ["MIT"]
},
"version": {
"name": "v1.9.0",
"name": "v1.9.2",
"desc": "Latest version of PhpMetrics",
"released": "2016-02-18",
"vcs_tag": "v1.9.0",
"released": "2016-03-20",
"vcs_tag": "v1.9.2",
"attributes": [],
"gpgSign": false
},
Expand Down
14 changes: 14 additions & 0 deletions templates/html/assets/styles.css.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ body {
padding: 0;
font-size: 1em;
text-align: center;
margin-bottom: 2.5em;
}
.container {
width: 1170px;
Expand Down Expand Up @@ -62,6 +63,19 @@ body {
.menu li.active a {
color: #fff;
}
.footer {
position: fixed;
bottom: 0;
left:0;
text-align: center;
font-size: 0.9em;
background: #FFF;
height: 2.5em;
width: 100%;
}
.footer .container {
text-align: center;
}


/* ---- tabs ---- */
Expand Down
9 changes: 5 additions & 4 deletions templates/html/summary/report.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,12 +332,13 @@
</div>


<div class="row">
Powered by <a href="http://www.phpmetrics.org">PhpMetrics</a> {% include 'version.html.twig' %} - Copyright Jean-François Lépine
<br/> Generated on {{"now"|date('jS \\o\\f F Y \\a\\t h:i:s A')}}
<div class="row footer">
<div class="container">
Powered by <a href="http://www.phpmetrics.org">PhpMetrics</a> {% include 'version.html.twig' %} - Copyright Jean-François Lépine
<br/> Generated on {{"now"|date('jS \\o\\f F Y \\a\\t h:i:s A')}}
</div>
</div>


</div>


Expand Down