From 91f00a518a61ff07be092968f98aba97507004d4 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Fri, 14 Sep 2018 17:50:03 +1000 Subject: [PATCH] ci: fix CI runs after 9e85bdb0 --- .circleci/config.yml | 2 ++ appveyor.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2ac7b6319e51..c1335e3d2ec3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -119,6 +119,7 @@ build-steps: &build-steps if [ "$RUN_TESTS" != "false" ]; then cd src ninja -C out/Default third_party/electron_node:headers + export ELECTRON_OUT_DIR=Default (cd electron && npm run test -- --ci --enable-logging) fi - <<: *notify-slack-failure @@ -195,6 +196,7 @@ mac-build-steps: &mac-build-steps if [ "$RUN_TESTS" != "false" ]; then cd src ninja -C out/Default third_party/electron_node:headers + export ELECTRON_OUT_DIR=Default (cd electron && npm run test -- --ci --enable-logging) fi - <<: *notify-slack-failure diff --git a/appveyor.yml b/appveyor.yml index 005b85713409..2fa527201ea0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,6 +4,7 @@ image: libcc-20-vs2017-15.7.4 environment: GIT_CACHE_PATH: C:\Users\electron\libcc_cache DISABLE_CRASH_REPORTER_TESTS: true + ELECTRON_OUT_DIR: Default build_script: - ps: >- if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {