Skip to content

Commit

Permalink
WIP: get travis to deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
c0bra committed Dec 19, 2013
1 parent 58dfff2 commit e5170ca
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 5 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ env:
- SAUCE_CONNECT_READY_FILE=/tmp/sauce-connect-ready
- LOGS_DIR=/tmp/angular-build/logs
- secure: PEQFPTi8DRVrj6dEl6tQ+QTI07N8A3XST9eu5uHyW9YuDErDpn6rE8iEI2bd6nU5jldF9cCaGprpEi6aTP71jxFkm2Yjk1PRxtSVo5Cvu7sEwaFOnZi2KBgpKAdv8T3GB4rcjePe3oPwSkw1i/s9THSe18KSzZdgwP2LMctlCyA=
- secure: A4ur05WzvEsExKuAR81MmxNldgYbpc8VwI/9hC2v+IWAAaFClWDH6OdlbfO8gNaWJVnLmvMS8emA7zkBuKgQhuMP0u8RoSwn7TOObaCICEM7mbFPRwCX1td0/4FyUdUUAE/jw3Cx4SBdrb0qGkMmdg36W4II1BBzkMnJblUfnNU=
# - secure: A4ur05WzvEsExKuAR81MmxNldgYbpc8VwI/9hC2v+IWAAaFClWDH6OdlbfO8gNaWJVnLmvMS8emA7zkBuKgQhuMP0u8RoSwn7TOObaCICEM7mbFPRwCX1td0/4FyUdUUAE/jw3Cx4SBdrb0qGkMmdg36W4II1BBzkMnJblUfnNU=
- secure: W2QpRQppqS1wMhbiOTOzJmaUXZtjUQdoWj+IKuyX6m7/A2A4YDXfNj+vzXfffbVqnBFDzrYRtcZ6IMmHn9QDs4gJaAaQDc1104UEd/sbVEujDn+9YOE3tTdRLE13FgdwwrLNcpypiPZ+rpWvEizRAlwoMXIiVhL8pUc1hysX9qM=

branches:
only:
Expand All @@ -29,9 +30,9 @@ before_script:
- ./lib/sauce/sauce_connect_block.sh

script:
- grunt
- after_success

after_success:
grunt:
- grunt test:ci
- git config credential.helper "store --file=.git/credentials"
- echo "https://${GH_TOKEN}:@github.com" > .git/credentials
Expand Down
4 changes: 2 additions & 2 deletions TODO.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
1. Copy angular-animate, prettify.js and marked.js into the docs/js dir separately from grunt-ngdocs. It's causing them to show up in `<script>` tags in the Examples which isn't what we want
1. Fix saucelabs hanging tests
1. Make sure failing saucelabs tests don't cause the build to fail. Only if the normal test run fails
1. Figure out how to run e2e tests on docs (look at angularjs source)
1. Figure out how to run e2e tests on docs (look at angularjs source / protractor?)
1. `readableColumnNames` need to be overrideable by i18n.
1. SauceLabs Mac test hanging?
1. Add banners to compiled .css files (grunt-banner?)
1. Add grunt util to find most recent stable release (i.e. semver with no suffix)

1. [DONE] Add --browsers option for testing on saucelabs with specific browser(s)
1. [DONE] Make karmangular run in `watch` mode and in singlerun too.
7 changes: 7 additions & 0 deletions lib/grunt/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,13 @@ var util = module.exports = {
grunt.config('customLaunchers', util.customLaunchers());
util.createKarmangularConfig()
util.createSauceConfig();

if (process.env.TRAVIS) {
grunt.config('gh-pages.gh-pages.options.user', {
name: grud,
email: nggridteam@gmail.com
});
}
},

// Get the current release version
Expand Down
5 changes: 5 additions & 0 deletions misc/site/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,20 @@ <h2>Angular UI Grid</h2>

<p>A data grid for <strong><a href="http://angularjs.org">AngularJS</a></strong></p>
<p>... more stuff ...</p>

<br>

<p class="btn-group2">
<a class="btn btn-success btn-large" href="https://github.com/angular-ui/ng-grid" title="Code on Github">
<i class="fa fa-github fa-fw"></i>
Code on Github
</a>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn-danger btn-large" href="https://github.com/angular-ui/ui-grid.info/tree/gh-pages" title="Download <%= version %>">
<i class="fa fa-download fa-fw"></i>
Download <!-- <small>(<%= pkg.version %>)</small> -->
</a>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn-success btn-large" href="http://<%= site %>/docs" title="API Documentation">
<i class="fa fa-gears fa-fw"></i>
API Documentation
Expand Down

0 comments on commit e5170ca

Please sign in to comment.