From c5dbbecc34e47c4f30f9908be995cc7f1f251381 Mon Sep 17 00:00:00 2001 From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com> Date: Thu, 10 Nov 2022 10:49:59 -0800 Subject: [PATCH] Fix GitHub workflow (#21191) --- .github/workflows/ci.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d0879e7925..3a95a2ef83 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -142,16 +142,9 @@ jobs: id: electron-unit-tests run: DISPLAY=:10 ./scripts/test.sh --runGlob "**/sql/**/*.test.js" --coverage - - name: Run Extension Unit Tests (Continue on Error) # {{SQL CARBON EDIT}} Run extension unit tests (continue on error) - id: electron-extension-unit-tests-continue-on-error + - name: Run Extension Unit Tests # {{SQL CARBON EDIT}} Rename to extension for clarity + id: electron-extension-unit-tests run: DISPLAY=:10 ./scripts/test-extensions-unit.sh - continueOnError: true - condition: and(succeeded(), eq(variables['EXTENSION_UNIT_TESTS_FAIL_ON_ERROR'], 'false')) - - - name: Run Extension Unit Tests (Fail on Error) # {{SQL CARBON EDIT}} Run extension unit tests (fail on error) - id: electron-extension-unit-tests-fail-on-error - run: DISPLAY=:10 ./scripts/test-extensions-unit.sh - condition: and(succeeded(), ne(variables['EXTENSION_UNIT_TESTS_FAIL_ON_ERROR'], 'false')) # {{SQL CARBON EDIT}} Add coveralls. We merge first to get around issue where parallel builds weren't being combined correctly - name: Combine code coverage files