Fix

Author: cknitt

.github/workflows/ci.yml

@@ -358,8 +358,6 @@ jobs:
         run: make -C tests/gentype_tests/typescript-react-example clean test
 
       - name: Run rewatch tests
-        env:
-          CLICOLOR_FORCE: 0
         run: ./rewatch/tests/suite-ci.sh
         shell: bash
 
@@ -525,7 +523,8 @@ jobs:
         working-directory: rewatch/testrepo
 
       - name: Run rewatch integration tests
-        run: make test-rewatch-integration
+        run: ./rewatch/tests/suite-ci.sh node_modules/.bin/rewatch
+        shell: bash
 
   publish:
     needs:

Makefile

@@ -47,9 +47,6 @@ test-gentype:
 test-rewatch:
 	./rewatch/tests/suite-ci.sh
 
-test-rewatch-integration:
-	./rewatch/tests/suite-ci.sh node_modules/.bin/rewatch
-
 test-all: test test-gentype test-analysis test-tools test-rewatch
 
 reanalyze:

rewatch/tests/suite-ci.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+
+unset CLICOLOR_FORCE
+
 # Make sure we are in the right directory
 cd $(dirname $0)
 
@@ -23,11 +26,11 @@ git checkout ../testrepo/package.json &> /dev/null
 success "Reset package.json and yarn.lock"
 
 bold "Make sure the testrepo is clean"
-if git diff --exit-code ../testrepo &> diff.txt; 
+if git diff --exit-code ../testrepo &> diff.txt;
 then
   rm diff.txt
   success "Testrepo has no changes"
-else 
+else
   error "Testrepo is not clean to start with"
   cat diff.txt
   rm diff.txt