Skip to content

Commit

Permalink
Circleci 2.0 (#315)
Browse files Browse the repository at this point in the history
* Fixes ci scripts and updates circleci to 2.0
  • Loading branch information
James-Crean authored Jul 25, 2018
1 parent 85d5bc3 commit bd30127
Show file tree
Hide file tree
Showing 4 changed files with 201 additions and 135 deletions.
16 changes: 10 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
version: 2.0

checkout:
post:
- ./ci-support/checkout_merge_commit.sh

jobs:
build:
macos:
xcode: "9.2.0"
steps:
- checkout
- run:
name: Pre install script for mac OS
name: debug
command: |
ls
pwd
bash vcdat/ci-support/circleci_mac_machine_pre.sh
echo $PATH > path_file
cat path_file
- run:
name: Checkout merge commit
name: Pre install script for mac OS
command: |
./ci-support/checkout_merge_commit.sh
bash ./ci-support/circleci_mac_machine_pre.sh
- run:
name: Install dependencies
command: |
Expand Down
16 changes: 13 additions & 3 deletions ci-support/circleci_mac.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@

# 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 ..
Expand All @@ -9,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
Expand Down
Loading

0 comments on commit bd30127

Please sign in to comment.