circle: refactor test script (#2488)

stephenplusplus · web-flow · commit 5883af7c1ffc · 2017-07-24T16:09:26.000-04:00
diff --git a/scripts/build.js b/scripts/build.js
@@ -51,7 +51,7 @@ var modules = Module.getUpdated();
 
 if (!modules.length && !ci.isReleaseBuild()) {
   echo('No code changes found, exiting early.');
-  exit(1);
+  exit();
 }
 
 Module.buildDocs();
diff --git a/scripts/circle/test.sh b/scripts/circle/test.sh
@@ -14,15 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-rebuild () {
-  for dir in packages/*; do
-    test -d "$dir" || continue
-    cd $dir
-    npm rebuild --update-binary
-    cd ../../
-  done
-}
-
 if [ "${CIRCLE_TAG}" != "" ] ||
    ([ "${CIRCLE_BRANCH}" == "master" ] && [ "${CI_PULL_REQUEST}" == "" ])
 then
@@ -37,35 +28,18 @@ fi
 git config --global user.name "circle-ci"
 git config --global user.email "circle-ci@circleci.com"
 
-nvm use v4
+nvm install $1
+nvm use $1
 npm install
-npm run lint
-node ./scripts/build.js
-
-if [ "$?" == "1" ]
-then
-  # No code changes. Exit early.
-  set -e
-  exit 0
-  set +e
-fi
 
-export COVERALLS_REPO_TOKEN="vKZ7a3PpW0lRBRWC12dPw2EiZE5ml962J"
-export CIRCLE_ARTIFACTS="$(pwd)/.coverage"
-npm run postinstall # installs all modules
-npm run coveralls
+# Re-compile native dependencies
+for dir in packages/*; do
+  test -d "$dir" || continue
+  cd $dir
+  npm rebuild --update-binary
+  cd ../../
+done
 
-nvm install v6 && nvm use v6
-rebuild
 npm run lint
-node ./scripts/build.js
 
-nvm install v7 && nvm use v7
-rebuild
-npm run lint
-node ./scripts/build.js
-
-nvm install v8 && nvm use v8
-rebuild
-npm run lint
 node ./scripts/build.js

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ var modules = Module.getUpdated();`
`51`	`51`
`52`	`52`	`if (!modules.length && !ci.isReleaseBuild()) {`
`53`	`53`	`echo('No code changes found, exiting early.');`
`54`		`- exit(1);`
	`54`	`+ exit();`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`Module.buildDocs();`