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.

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

Bugfix/circle ci configuration #12

Merged
merged 35 commits into from
Jun 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
92702fb
fix : add circleci file at correct location ?
Asone Jun 9, 2018
71a51bd
fix : change docker image for circle-ci config
Asone Jun 9, 2018
95ecf32
fix : change docker image for circle-ci config
Asone Jun 9, 2018
75d6387
fix : rename circle-ci config file
Asone Jun 9, 2018
dcf0365
fix : move config to appropriate naming folder
Asone Jun 9, 2018
010a098
fix : indentation in config file
Asone Jun 9, 2018
a992973
fix : try to switch on node alpine docker image
Asone Jun 9, 2018
daecd95
fix : remove useless files
Asone Jun 9, 2018
f34ee2e
fix : change node image to alpine
Asone Jun 9, 2018
69247d7
fix : Try to rebuild nose-sass in order to avoid install error
Asone Jun 9, 2018
6023eba
fix : replace mistaken run with command
Asone Jun 9, 2018
2bc7114
add an ls to see content of working dir
Asone Jun 9, 2018
362a4d5
fix : bad indentation
Asone Jun 9, 2018
f7aa49a
add working dir
Asone Jun 9, 2018
83b70d2
fix : clean npm cache before building
Asone Jun 9, 2018
438b5c0
fix : force clean npm cache before building
Asone Jun 9, 2018
0b548e5
fix : try with upgrading app-scripts
Asone Jun 12, 2018
f2e2b2e
remove local useless plugin
Asone Jun 12, 2018
03cc92a
fix : add browsers
Asone Jun 12, 2018
a1d088d
fix : try with another browsers image
Asone Jun 12, 2018
6129d7c
fix : bad image tag fix
Asone Jun 12, 2018
a901348
fix : bad image tag fix
Asone Jun 12, 2018
4e3d7e2
fix : try to updage packages
Asone Jun 16, 2018
81ba1e8
fix: try with another image
Asone Jun 16, 2018
018b795
fix : remove packages update
Asone Jun 16, 2018
eb063dd
fix : try with another image again
Asone Jun 16, 2018
338259d
fix : config file formatting
Asone Jun 16, 2018
01a3452
fix : giving it another try
Asone Jun 16, 2018
6dcca0c
fix : giving it another try
Asone Jun 16, 2018
f828e3b
fix : giving it another try
Asone Jun 16, 2018
0daa5dd
fix: adding sudo when necessary
Asone Jun 16, 2018
a7511e0
fix: try to output node env vars
Asone Jun 16, 2018
a52fe41
fix: try to build a node_env
Asone Jun 16, 2018
0030d75
fix: check circleci env variable in node process for karma conf
Asone Jun 16, 2018
a00d433
fix: remove custom useless plugin
Asone Jun 16, 2018
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
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