Skip to content

Commit

Permalink
Merge pull request #12 from Asone/bugfix/circle-ci-configuration
Browse files Browse the repository at this point in the history
Tests & builds passed on both travis & circle-ci. Merging.
  • Loading branch information
Asone authored Jun 16, 2018
2 parents 6c91791 + a00d433 commit cbe0f07
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 27 deletions.
18 changes: 0 additions & 18 deletions .circle-ci/config.yml

This file was deleted.

39 changes: 39 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
version: 2
jobs:
build:
working_directory: ~/project
docker:
- image: circleci/node:8.11.3-jessie-browsers
environment:
- NODE_ENV: "circleci"
steps:
- checkout
- run:
name: Cleaning npm cache
command: npm cache clean --force
- run:
name : Install cordova
command : sudo npm i -g cordova
- run:
name : see work dir
command : ls -la
- run:
name: Rebuild node-sass to avoid install problems
command: npm rebuild node-sass --force
- run:
name : Install ionic
command : sudo npm i -g ionic
- run:
name: Install node modules
command: npm install
- run:
name: echoing node env process var
command: echo $NODE_ENV
- run:
name: Run unit tests
command: npm test
- run:
name: Building android
command: ionic cordova build android
- store_artifacts:
path: platforms/android/build/outputs/apk/android-debug.apk
3 changes: 2 additions & 1 deletion config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
</plugin>
<plugin name="com.telerik.plugins.nativepagetransitions" spec="^0.6.5" />
<engine name="browser" spec="~5.0.3" />
<engine name="android" spec="~7.0.0" />
<engine name="ios" spec="^4.5.4" />
<engine name="android" spec="~7.0.0" />
<allow-navigation href="http://192.168.0.23:8100" />
</widget>
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@
"@ngx-translate/http-loader": "^3.0.1",
"chart.js": "^2.7.2",
"com.telerik.plugins.nativepagetransitions": "^0.6.5",
"cordova-android": "~7.0.0",
"cordova-android": "7.0.0",
"cordova-browser": "~5.0.3",
"cordova-ios": "^4.5.4",
"cordova-plugin-device": "^2.0.1",
"cordova-plugin-ionic-keyboard": "^2.0.5",
"cordova-plugin-ionic-webview": "^1.1.16",
"cordova-plugin-device": "^2.0.2",
"cordova-plugin-ionic-keyboard": "^2.1.2",
"cordova-plugin-ionic-webview": "^1.2.1",
"cordova-plugin-network-information": "^2.0.1",
"cordova-plugin-splashscreen": "^5.0.2",
"cordova-plugin-statusbar": "^2.4.1",
"cordova-plugin-statusbar": "^2.4.2",
"cordova-plugin-whitelist": "^1.3.3",
"cordova-sqlite-storage": "^2.3.0",
"cordova-sqlite-storage": "^2.3.2",
"ionic-angular": "3.9.2",
"ionic-plugin-deeplinks": "^1.0.15",
"ionic-tooltips": "^2.0.1",
Expand All @@ -58,7 +58,7 @@
"zone.js": "0.8.21"
},
"devDependencies": {
"@ionic/app-scripts": "3.1.8",
"@ionic/app-scripts": "^3.1.8",
"@types/jasmine": "^2.8.6",
"angular2-template-loader": "^0.6.2",
"html-loader": "^0.5.5",
Expand Down
2 changes: 1 addition & 1 deletion test-config/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ module.exports = function(config) {
concurrency: Infinity,
};

if (process.env.TRAVIS) {
if (process.env.TRAVIS || process.env.CIRCLECI) {
_config.browsers = ['ChromeHeadlessNoSandbox'];
_config.singleRun = true;
_config.concurrency = 1;
Expand Down

0 comments on commit cbe0f07

Please sign in to comment.