From 33536f8763bc11b88eaaf744aeb33a583abceb41 Mon Sep 17 00:00:00 2001 From: Jaden Diefenbaugh <jaden.diefenbaugh@idiap.ch> Date: Mon, 22 Oct 2018 11:51:40 -0700 Subject: [PATCH] try to get CI to run tests --- .gitlab-ci.yml | 2 +- conda/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 631b5a03..eb83d3cb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -102,7 +102,7 @@ build_macosx_36: - mv conda-bld ${CONDA_ROOT} script: - export BEAT_BROWSER_TESTS=true - - BOB_TEST_ONLY=true ./_ci/build.sh + - BEAT_BROWSER_TESTS=true BOB_TEST_ONLY=true ./_ci/build.sh after_script: - ./_ci/after_build.sh diff --git a/conda/meta.yaml b/conda/meta.yaml index 1d57ec77..fe746218 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -56,7 +56,7 @@ test: - beat editor --help - beat editor serve --help - nosetests --with-coverage --cover-package={{ name }} -sv {{ name }} - {% if environ.get('BEAT_BROWSER_TESTS', True) %} + {% if environ.get('BEAT_BROWSER_TESTS', False) %} - cd {{ project_dir }}/conda/js - npm install - npm test -- GitLab