-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #44 from MitocGroup/dev
Merge dev branch
- Loading branch information
Showing
68 changed files
with
511 additions
and
177 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,21 +8,24 @@ source $(dirname $0)/_head.sh | |
#################################################### | ||
### Install dependencies globally if don't exist ### | ||
#################################################### | ||
(npm list -g babel-cli --depth=0 || npm install -g babel-cli) &&\ | ||
(npm list -g babel-polyfill --depth=0 || npm install -g babel-polyfill) &&\ | ||
(npm list -g babel-preset-es2015 --depth=0 || npm install -g babel-preset-es2015) &&\ | ||
(npm list -g deepify@$(npm show deepify version) --depth=0 || npm install -g deepify) &&\ | ||
(npm list -g jspm --depth=0 || npm install -g [email protected]) &&\ | ||
(npm list -g browserify --depth=0 || npm install -g [email protected]) &&\ | ||
(npm list -g jscs --depth=0 || npm install -g [email protected]) &&\ | ||
(npm list -g mocha --depth=0 || npm install -g mocha@2.3.x) &&\ | ||
(npm list -g mocha --depth=0 || npm install -g mocha@2.4.x) &&\ | ||
(npm list -g codacy-coverage --depth=0 || npm install -g [email protected]) &&\ | ||
(npm list -g chai --depth=0 || npm install -g [email protected]) &&\ | ||
(npm list -g jasmine-core --depth=0 || npm install -g [email protected]) &&\ | ||
(npm list -g istanbul --depth=0 || npm install -g istanbul@0.3.x) &&\ | ||
(npm list -g istanbul@^1.0.0-alpha --depth=0 || npm install -g istanbul@^1.0.0-alpha) &&\ | ||
(npm list -g istanbul-combine --depth=0 || npm install -g [email protected]) &&\ | ||
(npm list -g karma --depth=0 || npm install -g [email protected]) &&\ | ||
(npm list -g karma-jspm --depth=0 || npm install -g [email protected]) &&\ | ||
(npm list -g karma-jasmine --depth=0 || npm install -g [email protected]) &&\ | ||
(npm list -g karma-babel-preprocessor --depth=0 || npm install -g [email protected]) &&\ | ||
(npm list -g karma-coverage@douglasduteil/karma-coverage#next --depth=0 || npm install -g karma-coverage@douglasduteil/karma-coverage#next) &&\ | ||
(npm list -g karma-coverage@1.0.x --depth=0 || npm install -g karma-coverage@1.0.x) &&\ | ||
(npm list -g karma-verbose-reporter --depth=0 || npm install -g [email protected]) &&\ | ||
(npm list -g karma-phantomjs-launcher --depth=0 || npm install -g [email protected]) &&\ | ||
(npm list -g karma-ng-html2js-preprocessor --depth=0 || npm install -g [email protected]) &&\ | ||
|
@@ -57,8 +60,9 @@ if [ "${__E2E_WITH_PUBLIC_REPO}" = "${E2E_TESTING}" ] || [ "${__E2E_WITH_PRIVATE | |
############################################################### | ||
### Install locally, protractor doesn't find babel globally ### | ||
############################################################### | ||
(if [ ! -d "node_modules/babel-cli" ]; then npm install babel-cli; fi) &&\ | ||
(if [ ! -d "node_modules/babel-preset-es2015" ]; then npm install babel-preset-es2015; fi) &&\ | ||
(npm list -g babel-register --depth=0 || npm install -g babel-register) &&\ | ||
(if [ ! -d "node_modules/babel-cli" ]; then npm link babel-cli; fi) &&\ | ||
(if [ ! -d "node_modules/babel-preset-es2015" ]; then npm link babel-preset-es2015; fi) &&\ | ||
(if [ ! -d "node_modules/babel-plugin-add-module-exports" ]; then npm install babel-plugin-add-module-exports; fi) &&\ | ||
(if [ ! -d "node_modules/jasmine2-custom-message" ]; then npm install [email protected]; fi) &&\ | ||
(if [ ! -d "node_modules/jasmine-utils" ]; then npm install [email protected]; fi) | ||
|
@@ -85,14 +89,25 @@ if [ "$TRAVIS" == "true" ]; then | |
|
||
export TRAVIS_COMMIT_MESSAGE=${TRAVIS_COMMIT_MESSAGES[1]} | ||
|
||
TRAVIS_FROM_BRANCH="travis_from_branch" | ||
git branch $TRAVIS_FROM_BRANCH | ||
git checkout $TRAVIS_FROM_BRANCH | ||
git fetch origin $TRAVIS_BRANCH | ||
git checkout -qf FETCH_HEAD | ||
git branch $TRAVIS_BRANCH | ||
git checkout $TRAVIS_BRANCH | ||
git checkout $TRAVIS_FROM_BRANCH | ||
########################### | ||
### Case for merging PR ### | ||
########################### | ||
if [ -n "$(git show-ref refs/heads/${TRAVIS_BRANCH})" ]; then | ||
export PR_MERGE=true | ||
echo "branch ${TRAVIS_BRANCH} exists!" | ||
else | ||
TRAVIS_FROM_BRANCH="travis_from_branch" | ||
git branch $TRAVIS_FROM_BRANCH | ||
git checkout $TRAVIS_FROM_BRANCH | ||
git fetch origin $TRAVIS_BRANCH | ||
git checkout -qf FETCH_HEAD | ||
git branch $TRAVIS_BRANCH | ||
git checkout $TRAVIS_BRANCH | ||
git checkout $TRAVIS_FROM_BRANCH | ||
fi | ||
|
||
else | ||
export TRAVIS_COMMIT_MESSAGE=$(git log -1 --pretty=%s) | ||
fi | ||
|
||
############################################################################################ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
24 changes: 0 additions & 24 deletions
24
src/deep-hello-world/tests/backend/node-bin/postinstall.sh
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
13 changes: 0 additions & 13 deletions
13
src/deep-hello-world/tests/backend/test/say-hello/create-db/bootstrap.spec.js
This file was deleted.
Oops, something went wrong.
13 changes: 0 additions & 13 deletions
13
src/deep-hello-world/tests/backend/test/say-hello/create-db/handler.spec.js
This file was deleted.
Oops, something went wrong.
13 changes: 0 additions & 13 deletions
13
src/deep-hello-world/tests/backend/test/say-hello/create-fs/bootstrap.spec.js
This file was deleted.
Oops, something went wrong.
13 changes: 0 additions & 13 deletions
13
src/deep-hello-world/tests/backend/test/say-hello/create-fs/handler.spec.js
This file was deleted.
Oops, something went wrong.
13 changes: 0 additions & 13 deletions
13
src/deep-hello-world/tests/backend/test/say-hello/create-msg/bootstrap.spec.js
This file was deleted.
Oops, something went wrong.
13 changes: 0 additions & 13 deletions
13
src/deep-hello-world/tests/backend/test/say-hello/create-msg/handler.spec.js
This file was deleted.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions
4
src/deep-hello-world/deepkg.json → src/deep-helloworld/deepkg.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"presets": [ | ||
"es2015" | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
instrumentation: | ||
root: ./../../backend/src | ||
extensions: | ||
- .js |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
#!/bin/bash | ||
|
||
npm link chai &&\ | ||
npm link aws-sdk &&\ | ||
npm link node-dir &&\ | ||
npm link deepify &&\ | ||
npm link babel-preset-es2015 &&\ | ||
|
||
############################################ | ||
#TODO: TEMPORARY FIX FOR NODE MORE THAN v5 # | ||
############################################ | ||
(npm list -g deep-framework --depth=0 || npm install deep-framework -g babel-cli) &&\ | ||
npm link deep-framework |
Oops, something went wrong.