From 92a0ee7ea8544449ed4b385778e5fbd81df0dcee Mon Sep 17 00:00:00 2001 From: Crean Date: Tue, 24 Jul 2018 12:57:50 -0700 Subject: [PATCH 01/11] Splits debug info from commands in circleci config --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0c13998..b98c30b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,10 +6,13 @@ jobs: xcode: "9.2.0" steps: - run: - name: Pre install script for mac OS + name: Debug info command: | ls pwd + - run: + name: Pre install script for mac OS + command: | bash vcdat/ci-support/circleci_mac_machine_pre.sh - run: name: Checkout merge commit From 1918fb7c233bf8809bee3302bc11e9594310a8a7 Mon Sep 17 00:00:00 2001 From: Crean Date: Tue, 24 Jul 2018 13:04:57 -0700 Subject: [PATCH 02/11] Adds magic checkout command --- .circleci/config.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b98c30b..58ff30e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,11 +5,7 @@ jobs: macos: xcode: "9.2.0" steps: - - run: - name: Debug info - command: | - ls - pwd + - checkout - run: name: Pre install script for mac OS command: | From 3268056a2baea58962409932c3853dd2ef822b6e Mon Sep 17 00:00:00 2001 From: Crean Date: Tue, 24 Jul 2018 13:06:39 -0700 Subject: [PATCH 03/11] Attempting to fix path --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 58ff30e..110b5dd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: - run: name: Pre install script for mac OS command: | - bash vcdat/ci-support/circleci_mac_machine_pre.sh + bash ~/vcdat/ci-support/circleci_mac_machine_pre.sh - run: name: Checkout merge commit command: | From d72c9a56fd4a7e68c715172ea2ce37c9922cafbf Mon Sep 17 00:00:00 2001 From: Crean Date: Tue, 24 Jul 2018 13:08:39 -0700 Subject: [PATCH 04/11] Attempting to fix path2 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 110b5dd..0363b92 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: - run: name: Pre install script for mac OS command: | - bash ~/vcdat/ci-support/circleci_mac_machine_pre.sh + bash ~/project/vcdat/ci-support/circleci_mac_machine_pre.sh - run: name: Checkout merge commit command: | From 7ae9d6dadee9f383c0c5f84384d6113c3318a24c Mon Sep 17 00:00:00 2001 From: Crean Date: Tue, 24 Jul 2018 14:38:44 -0700 Subject: [PATCH 05/11] Moves merge commit script to post checkout --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0363b92..f3a393e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,9 @@ version: 2.0 +checkout: + post: + - ./ci-support/checkout_merge_commit.sh + jobs: build: macos: @@ -9,11 +13,7 @@ jobs: - run: name: Pre install script for mac OS command: | - bash ~/project/vcdat/ci-support/circleci_mac_machine_pre.sh - - run: - name: Checkout merge commit - command: | - ./ci-support/checkout_merge_commit.sh + bash vcdat/ci-support/circleci_mac_machine_pre.sh - run: name: Install dependencies command: | From 1ef97fc07115f3c0ecfbe64815e4e80ed02d5b5b Mon Sep 17 00:00:00 2001 From: Crean Date: Tue, 24 Jul 2018 15:42:32 -0700 Subject: [PATCH 06/11] Fixes path again --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f3a393e..b9ba53c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ jobs: - run: name: Pre install script for mac OS command: | - bash vcdat/ci-support/circleci_mac_machine_pre.sh + bash ./ci-support/circleci_mac_machine_pre.sh - run: name: Install dependencies command: | From 5426b94e0d9434c080f381489e7e57753be99412 Mon Sep 17 00:00:00 2001 From: Crean Date: Wed, 25 Jul 2018 10:18:55 -0700 Subject: [PATCH 07/11] Updates sass package. Adds options to script to reliably catch errors --- ci-support/circleci_mac.sh | 11 ++ frontend/package-lock.json | 302 ++++++++++++++++++++++--------------- frontend/package.json | 2 +- 3 files changed, 189 insertions(+), 126 deletions(-) diff --git a/ci-support/circleci_mac.sh b/ci-support/circleci_mac.sh index b262f5c..c0e4ec9 100644 --- a/ci-support/circleci_mac.sh +++ b/ci-support/circleci_mac.sh @@ -1,6 +1,17 @@ + +# Exit script if you try to use an uninitialized variable. +set -o nounset + +# Exit script if a statement returns a non-true return value. +set -o errexit + +# Use the error status of the first failure, rather than that of the last item in a pipeline. +set -o pipefail + export UVCDAT_ANONYMOUS_LOG=False export UVCDAT_SETUP_PATH=${HOME} export PATH=${HOME}/miniconda/bin:${PATH} + cd frontend npm install cd .. diff --git a/frontend/package-lock.json b/frontend/package-lock.json index db558ce..9c47c6c 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -156,9 +156,9 @@ "dev": true }, "are-we-there-yet": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", - "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "requires": { "delegates": "1.0.0", @@ -4149,16 +4149,16 @@ "signal-exit": "3.0.2", "string-width": "1.0.2", "strip-ansi": "3.0.1", - "wide-align": "1.1.2" + "wide-align": "1.1.3" } }, "gaze": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz", - "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", + "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", "dev": true, "requires": { - "globule": "1.2.0" + "globule": "1.2.1" } }, "generate-function": { @@ -4279,14 +4279,22 @@ } }, "globule": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz", - "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz", + "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==", "dev": true, "requires": { "glob": "7.1.2", - "lodash": "4.17.5", + "lodash": "4.17.10", "minimatch": "3.0.4" + }, + "dependencies": { + "lodash": { + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", + "dev": true + } } }, "graceful-fs": { @@ -5669,7 +5677,8 @@ "version": "2.9.2", "resolved": "https://registry.npmjs.org/nan/-/nan-2.9.2.tgz", "integrity": "sha512-ltW65co7f3PQWBDbqVvaU1WtFJUsNW7sWWm4HINhbMQIyVyzIeyZ8toX5TC5eeooE6piZoaEh4cZkueSKG3KYw==", - "dev": true + "dev": true, + "optional": true }, "nearley": { "version": "2.13.0", @@ -5711,92 +5720,35 @@ } }, "node-gyp": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz", - "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.7.0.tgz", + "integrity": "sha512-qDQE/Ft9xXP6zphwx4sD0t+VhwV7yFaloMpfbL2QnnDZcyaiakWlLdtFGGQfTAwpFHdpbRhRxVhIHN1OKAjgbg==", "dev": true, "requires": { "fstream": "1.0.11", "glob": "7.1.2", "graceful-fs": "4.1.11", - "minimatch": "3.0.4", "mkdirp": "0.5.1", "nopt": "3.0.6", "npmlog": "4.1.2", "osenv": "0.1.5", - "request": "2.83.0", + "request": "2.81.0", "rimraf": "2.6.2", "semver": "5.3.0", "tar": "2.2.1", "which": "1.3.0" }, "dependencies": { - "semver": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", - "dev": true - } - } - }, - "node-libs-browser": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz", - "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==", - "dev": true, - "requires": { - "assert": "1.4.1", - "browserify-zlib": "0.2.0", - "buffer": "4.9.1", - "console-browserify": "1.1.0", - "constants-browserify": "1.0.0", - "crypto-browserify": "3.12.0", - "domain-browser": "1.2.0", - "events": "1.1.1", - "https-browserify": "1.0.0", - "os-browserify": "0.3.0", - "path-browserify": "0.0.0", - "process": "0.11.10", - "punycode": "1.4.1", - "querystring-es3": "0.2.1", - "readable-stream": "2.3.4", - "stream-browserify": "2.0.1", - "stream-http": "2.8.0", - "string_decoder": "1.0.3", - "timers-browserify": "2.0.6", - "tty-browserify": "0.0.0", - "url": "0.11.0", - "util": "0.10.3", - "vm-browserify": "0.0.4" - } - }, - "node-sass": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.7.2.tgz", - "integrity": "sha512-CaV+wLqZ7//Jdom5aUFCpGNoECd7BbNhjuwdsX/LkXBrHl8eb1Wjw4HvWqcFvhr5KuNgAk8i/myf/MQ1YYeroA==", - "dev": true, - "requires": { - "async-foreach": "0.1.3", - "chalk": "1.1.3", - "cross-spawn": "3.0.1", - "gaze": "1.1.2", - "get-stdin": "4.0.1", - "glob": "7.1.2", - "in-publish": "2.0.0", - "lodash.assign": "4.2.0", - "lodash.clonedeep": "4.5.0", - "lodash.mergewith": "4.6.1", - "meow": "3.7.0", - "mkdirp": "0.5.1", - "nan": "2.9.2", - "node-gyp": "3.6.2", - "npmlog": "4.1.2", - "request": "2.79.0", - "sass-graph": "2.2.4", - "stdout-stream": "1.4.0", - "true-case-path": "1.0.2" - }, - "dependencies": { + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "dev": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, "assert-plus": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", @@ -5818,22 +5770,6 @@ "hoek": "2.16.3" } }, - "caseless": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", - "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=", - "dev": true - }, - "cross-spawn": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", - "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", - "dev": true, - "requires": { - "lru-cache": "4.1.1", - "which": "1.3.0" - } - }, "cryptiles": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", @@ -5854,16 +5790,20 @@ "mime-types": "2.1.18" } }, + "har-schema": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", + "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=", + "dev": true + }, "har-validator": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", - "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", + "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", "dev": true, "requires": { - "chalk": "1.1.3", - "commander": "2.14.1", - "is-my-json-valid": "2.17.2", - "pinkie-promise": "2.0.1" + "ajv": "4.11.8", + "har-schema": "1.0.5" } }, "hawk": { @@ -5895,26 +5835,32 @@ "sshpk": "1.13.1" } }, + "performance-now": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", + "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", + "dev": true + }, "qs": { - "version": "6.3.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz", - "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", + "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=", "dev": true }, "request": { - "version": "2.79.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", - "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=", + "version": "2.81.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", + "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", "dev": true, "requires": { "aws-sign2": "0.6.0", "aws4": "1.6.0", - "caseless": "0.11.0", + "caseless": "0.12.0", "combined-stream": "1.0.6", "extend": "3.0.1", "forever-agent": "0.6.1", "form-data": "2.1.4", - "har-validator": "2.0.6", + "har-validator": "4.2.1", "hawk": "3.1.3", "http-signature": "1.1.1", "is-typedarray": "1.0.0", @@ -5922,13 +5868,21 @@ "json-stringify-safe": "5.0.1", "mime-types": "2.1.18", "oauth-sign": "0.8.2", - "qs": "6.3.2", + "performance-now": "0.2.0", + "qs": "6.4.0", + "safe-buffer": "5.1.1", "stringstream": "0.0.5", "tough-cookie": "2.3.4", - "tunnel-agent": "0.4.3", + "tunnel-agent": "0.6.0", "uuid": "3.2.1" } }, + "semver": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", + "dev": true + }, "sntp": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", @@ -5937,12 +5891,110 @@ "requires": { "hoek": "2.16.3" } + } + } + }, + "node-libs-browser": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz", + "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==", + "dev": true, + "requires": { + "assert": "1.4.1", + "browserify-zlib": "0.2.0", + "buffer": "4.9.1", + "console-browserify": "1.1.0", + "constants-browserify": "1.0.0", + "crypto-browserify": "3.12.0", + "domain-browser": "1.2.0", + "events": "1.1.1", + "https-browserify": "1.0.0", + "os-browserify": "0.3.0", + "path-browserify": "0.0.0", + "process": "0.11.10", + "punycode": "1.4.1", + "querystring-es3": "0.2.1", + "readable-stream": "2.3.4", + "stream-browserify": "2.0.1", + "stream-http": "2.8.0", + "string_decoder": "1.0.3", + "timers-browserify": "2.0.6", + "tty-browserify": "0.0.0", + "url": "0.11.0", + "util": "0.10.3", + "vm-browserify": "0.0.4" + } + }, + "node-sass": { + "version": "4.9.2", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.2.tgz", + "integrity": "sha512-LdxoJLZutx0aQXHtWIYwJKMj+9pTjneTcLWJgzf2XbGu0q5pRNqW5QvFCEdm3mc5rJOdru/mzln5d0EZLacf6g==", + "dev": true, + "requires": { + "async-foreach": "0.1.3", + "chalk": "1.1.3", + "cross-spawn": "3.0.1", + "gaze": "1.1.3", + "get-stdin": "4.0.1", + "glob": "7.1.2", + "in-publish": "2.0.0", + "lodash.assign": "4.2.0", + "lodash.clonedeep": "4.5.0", + "lodash.mergewith": "4.6.1", + "meow": "3.7.0", + "mkdirp": "0.5.1", + "nan": "2.10.0", + "node-gyp": "3.7.0", + "npmlog": "4.1.2", + "request": "2.87.0", + "sass-graph": "2.2.4", + "stdout-stream": "1.4.0", + "true-case-path": "1.0.2" + }, + "dependencies": { + "cross-spawn": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", + "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", + "dev": true, + "requires": { + "lru-cache": "4.1.1", + "which": "1.3.0" + } }, - "tunnel-agent": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", - "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=", + "nan": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", + "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==", "dev": true + }, + "request": { + "version": "2.87.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", + "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", + "dev": true, + "requires": { + "aws-sign2": "0.7.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.6", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.3.2", + "har-validator": "5.0.3", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.18", + "oauth-sign": "0.8.2", + "performance-now": "2.1.0", + "qs": "6.5.1", + "safe-buffer": "5.1.1", + "tough-cookie": "2.3.4", + "tunnel-agent": "0.6.0", + "uuid": "3.2.1" + } } } }, @@ -9873,7 +9925,7 @@ "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "requires": { - "are-we-there-yet": "1.1.4", + "are-we-there-yet": "1.1.5", "console-control-strings": "1.1.0", "gauge": "2.7.4", "set-blocking": "2.0.0" @@ -14557,9 +14609,9 @@ "dev": true }, "wide-align": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", - "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "requires": { "string-width": "1.0.2" diff --git a/frontend/package.json b/frontend/package.json index fc61841..cd8df1e 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -60,7 +60,7 @@ "jsdom-global": "^3.0.2", "mocha": "^5.2.0", "mocha-jsdom": "^1.1.0", - "node-sass": "^4.5.3", + "node-sass": "^4.9.2", "nyc": "^11.3.0", "react-addons-test-utils": "^15.3.1", "redux-test-utils": "^0.2.1", From b40de514510395f7ef6708eee81d84800cf9a528 Mon Sep 17 00:00:00 2001 From: Crean Date: Wed, 25 Jul 2018 11:33:43 -0700 Subject: [PATCH 08/11] Removes path manipulation that may be breaking the script --- ci-support/circleci_mac.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci-support/circleci_mac.sh b/ci-support/circleci_mac.sh index c0e4ec9..9f3b1c2 100644 --- a/ci-support/circleci_mac.sh +++ b/ci-support/circleci_mac.sh @@ -9,8 +9,7 @@ set -o errexit set -o pipefail export UVCDAT_ANONYMOUS_LOG=False -export UVCDAT_SETUP_PATH=${HOME} -export PATH=${HOME}/miniconda/bin:${PATH} +# export PATH=${HOME}/miniconda/bin:${PATH} cd frontend npm install From 9d49ccc754346b1bbee450d9f8f53cc037900b25 Mon Sep 17 00:00:00 2001 From: Crean Date: Wed, 25 Jul 2018 11:46:31 -0700 Subject: [PATCH 09/11] Adds debug step --- .circleci/config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index b9ba53c..a77b671 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,6 +10,11 @@ jobs: xcode: "9.2.0" steps: - checkout + - run: + name: debug + command: | + echo $PATH > path_file + cat path_file - run: name: Pre install script for mac OS command: | From b86738831f4b51e494cbd99fe5282a77d7cfc1e3 Mon Sep 17 00:00:00 2001 From: Crean Date: Wed, 25 Jul 2018 11:47:52 -0700 Subject: [PATCH 10/11] Fixes indentation --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a77b671..280d7be 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,10 +11,10 @@ jobs: steps: - checkout - run: - name: debug - command: | - echo $PATH > path_file - cat path_file + name: debug + command: | + echo $PATH > path_file + cat path_file - run: name: Pre install script for mac OS command: | From 8e9d2b954ac3de8bd755d3039a4ceaffe45b0112 Mon Sep 17 00:00:00 2001 From: Crean Date: Wed, 25 Jul 2018 12:18:03 -0700 Subject: [PATCH 11/11] Reverts path change. Fix bash syntax error --- ci-support/circleci_mac.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-support/circleci_mac.sh b/ci-support/circleci_mac.sh index 9f3b1c2..5e51fbe 100644 --- a/ci-support/circleci_mac.sh +++ b/ci-support/circleci_mac.sh @@ -9,7 +9,7 @@ set -o errexit set -o pipefail export UVCDAT_ANONYMOUS_LOG=False -# export PATH=${HOME}/miniconda/bin:${PATH} +export PATH=${HOME}/miniconda/bin:${PATH} cd frontend npm install @@ -19,9 +19,9 @@ cd frontend npm run coverage RESULT=$? npm run coveralls -RESULT=$RESULT + $? +RESULT=$(($RESULT + $?)) cd .. -echo "test commands exit result:",$RESULT +echo "test commands exit result: $RESULT" if [ $RESULT -eq 0 -a $CIRCLE_BRANCH == "master" ]; then conda install -n root conda-build anaconda-client ; fi if [ $RESULT -eq 0 -a $CIRCLE_BRANCH == "master" ]; then bash ./ci-support/conda_upload.sh ; fi exit $RESULT