diff --git a/.github/workflows/pr_flow.yml b/.github/workflows/pr_flow.yml index 3de95e88..7388ebdb 100644 --- a/.github/workflows/pr_flow.yml +++ b/.github/workflows/pr_flow.yml @@ -23,10 +23,8 @@ jobs: with: token: ${{ secrets.CODECOV_TOKEN }} files: ./target/coverage/codecov.json - - name: Unit tests in Clojure - run: make clj-test - - name: Unit tests in Java - run: make java-test + - name: Run unit tests + run: make clj-test java-test - name: Test Report uses: dorny/test-reporter@v1 if: success() || failure() diff --git a/.github/workflows/pr_visual_flow.yml b/.github/workflows/pr_visual_flow.yml index aaca3b5f..990555a7 100644 --- a/.github/workflows/pr_visual_flow.yml +++ b/.github/workflows/pr_visual_flow.yml @@ -21,12 +21,8 @@ jobs: uses: DeLaGuardo/setup-clojure@10.3 with: cli: latest - - name: Install dependencies - run: clojure -P - - name: Compile Java - run: clojure -T:build compile-java - name: Test Clojure - run: clojure -M:test --focus stencil.visual-test + run: make visual-test - name: Archive diff png uses: actions/upload-artifact@v3 if: failure() diff --git a/Makefile b/Makefile index e4bb0a98..bbc8a88c 100644 --- a/Makefile +++ b/Makefile @@ -28,12 +28,15 @@ compile: clean prepare clj-test: clean compile clojure -M:test -java-test: clean compile +java-test: clean clojure -T:build java-test +visual-test: clean compile + clojure -M:test --focus stencil.visual-test + coverage: clean prepare compile clojure -M:coverage -test: clean prepare compile clj-test java-test +test: clean prepare compile clj-test java-test visual-test all: clean compile lint test \ No newline at end of file