From 8175dbe4a118bf443964aa1f4da491b36a93ee4d Mon Sep 17 00:00:00 2001 From: 0xADADA <0xadada.pub@0xadada.pub> Date: Tue, 30 Jan 2018 21:17:37 -0500 Subject: [PATCH] build fixes --- .circleci/config.yml | 12 +++++++++++- package.json | 2 +- yarn.lock | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 543883f..5f6fa37 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,14 @@ # circleci/config.yml version: 2 +# Reusable definitions shared between jobs +defs: + steps: + step-update-path: &step-update-path + name: Update $PATH + command: | + echo "export PATH=$PATH:$(yarn global bin)" >> $BASH_ENV + jobs: build: docker: @@ -23,10 +31,12 @@ jobs: key: dependency-cache-{{ checksum "yarn.lock" }} paths: - ./node_modules + - run: + <<: *step-update-path - run: name: Run tests command: | npm rebuild node-sass 2>&1 > /dev/null - ./node_modules/ember-cli/bin/ember --version --verbose + ember --version --verbose yarn test yarn coverage diff --git a/package.json b/package.json index ed56d7f..7ff10e9 100644 --- a/package.json +++ b/package.json @@ -90,6 +90,6 @@ "node-fetch" ], "resolutions": { - "ember-simple-auth": "0xadada/ember-simple-auth#b520d6bbd17ec2b99d792a75ae8a8b119af4d08a" + "ember-simple-auth": "0xadada/ember-simple-auth#13a8a1d461fdac769f566b41beda61972118c2b4" } } diff --git a/yarn.lock b/yarn.lock index e903911..193b0c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3643,9 +3643,9 @@ ember-runtime-enumerable-includes-polyfill@^2.0.0: ember-cli-babel "^6.9.0" ember-cli-version-checker "^2.1.0" -ember-simple-auth@0xadada/ember-simple-auth#b520d6bbd17ec2b99d792a75ae8a8b119af4d08a, ember-simple-auth@^1.4.2: +ember-simple-auth@0xadada/ember-simple-auth#13a8a1d461fdac769f566b41beda61972118c2b4, ember-simple-auth@^1.4.2: version "1.4.2" - resolved "https://codeload.github.com/0xadada/ember-simple-auth/tar.gz/b520d6bbd17ec2b99d792a75ae8a8b119af4d08a" + resolved "https://codeload.github.com/0xadada/ember-simple-auth/tar.gz/13a8a1d461fdac769f566b41beda61972118c2b4" dependencies: base-64 "^0.1.0" broccoli-file-creator "^1.1.1"