Skip to content
This repository was archived by the owner on Nov 1, 2017. It is now read-only.

Commit 5c766d1

Browse files
committed
Merge pull request #29 from github/bower-cleanup
Bower package cleanup
2 parents b7288af + 1006a4f commit 5c766d1

File tree

3 files changed

+10
-19
lines changed

3 files changed

+10
-19
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: ruby
2+
install: ./script/bootstrap
23
script: ./script/cibuild
3-
before_install: ./script/bootstrap
44
rvm:
55
- 1.9.3
66
- 2.0.0

bower.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
{
22
"name": "task-lists",
3+
"version": "0.4.0",
34
"dependencies": {
4-
"jquery": ">= 1.9.1",
5+
"jquery": ">= 1.9.1"
6+
},
7+
"devDependencies": {
58
"qunit": ">= 1.0"
6-
}
9+
},
10+
"main": [
11+
"app/assets/javascripts/task_lists.coffee",
12+
"app/assets/stylesheets/task_lists.scss"
13+
]
714
}

script/cibuild

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,6 @@
11
#!/bin/sh -e
22
# Usage: script/cibuild
33
# CI build script.
4-
# This is tailored for the janky build machines.
54

6-
# change into root dir and setup path
7-
cd $(dirname "$0")/..
8-
export PATH="$(pwd)/bin:$(pwd)/script:$(pwd)/node_modules/.bin:/usr/share/rbenv/shims:/opt/phantomjs/bin:/usr/share/nvm/0.8.11/bin:$PATH"
9-
10-
# setup Ruby version
11-
if [ -d /usr/share/rbenv/shims ]; then export PATH=/usr/share/rbenv/shims:$PATH; fi
12-
export RBENV_VERSION="1.9.3-p231-tcs-github"
13-
14-
# Write commit we're building at
15-
git log -n 1 || true
16-
echo
17-
18-
export DISPLAY=:99.0
19-
20-
./script/bootstrap
215
./script/testsuite 4018
226
bundle exec rake test

0 commit comments

Comments
 (0)