Skip to content

Commit 54c8992

Browse files
committed
update ci setup
1 parent b9cea15 commit 54c8992

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

build/ci.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
if [ -z "$CIRCLE_PULL_REQUEST" ]
2+
then
3+
npm run unit
4+
# start sauce connect
5+
cd sc-*-linux && ./bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY -f ~/sc_ready &
6+
# Wait for tunnel to be ready
7+
while [ ! -e ~/sc_ready ]; do sleep 1; done
8+
# serve example app
9+
npm run serve &
10+
# Run selenium tests
11+
npm run e2e-sauce
12+
else
13+
npm test
14+
fi

circle.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,4 @@ dependencies:
1010

1111
test:
1212
override:
13-
# Run unit tests
14-
- npm run unit
15-
# start sauce connect
16-
- cd sc-*-linux && ./bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY -f ~/sc_ready:
17-
background: true
18-
# Wait for tunnel to be ready
19-
- while [ ! -e ~/sc_ready ]; do sleep 1; done
20-
# serve example app
21-
- npm run serve:
22-
background: true
23-
# Run selenium tests
24-
- npm run e2e-sauce
13+
- bash ./build/ci.sh

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@
5050
"karma-phantomjs-launcher": "^0.2.1",
5151
"karma-spec-reporter": "0.0.20",
5252
"karma-webpack": "^1.7.0",
53-
"nightwatch": "^0.7.9",
53+
"nightwatch": "^0.8.4",
5454
"phantomjs": "^1.9.18",
5555
"selenium-server": "2.47.1",
5656
"style-loader": "^0.12.3",
57-
"vue": "yyx990803/vue#dev",
57+
"vue": "yyx990803/vue#1.0.0-beta",
5858
"vue-loader": "^3.0.3",
5959
"webpack": "^1.11.0",
6060
"webpack-dev-server": "^1.10.1"

0 commit comments

Comments
 (0)