From 8f7afb4a57621af2eeda0b3f9a20f4d1f2997c0a Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sun, 21 Mar 2021 17:39:40 -0400 Subject: [PATCH] Fix Zotero.automatedTest in GitHub Actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit $TRAVIS → $CI Some tests were being run that should be skipped --- test/runtests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/runtests.sh b/test/runtests.sh index 78a89d2f26..a0d39b9a94 100755 --- a/test/runtests.sh +++ b/test/runtests.sh @@ -185,7 +185,7 @@ if [ -z $IS_CYGWIN ]; then echo "`MOZ_NO_REMOTE=1 NO_EM_RESTART=1 \"$FX_EXECUTABLE\" -v`" fi -if [ "$TRAVIS" = true ]; then +if [ -n "$CI" ]; then FX_ARGS="$FX_ARGS -ZoteroAutomatedTest -ZoteroTestTimeout 15000" fi @@ -194,7 +194,7 @@ trap "{ rm -rf \"$TEMPDIR\"; }" EXIT # Check if build watch process is running # If not, run now -if [[ "$TRAVIS" != true ]] && ! ps | grep scripts/build.js | grep -v grep > /dev/null; then +if [[ -z "$CI" ]] && ! ps | grep scripts/build.js | grep -v grep > /dev/null; then echo echo "Running JS build process" cd "$ROOT_DIR"