use make test

taji-taji · Sep 3, 2022 · 67c2c28 · 67c2c28
1 parent 960c924
commit 67c2c28
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,19 +30,33 @@ jobs:
         id: get-swift-version
         run: |
           echo "::set-output name=version::$(swift -version | head -n 1 | sed s/,// )"
+      - name: Cache DevTools
+        uses: actions/cache@v2
+        with:
+          path: |
+            ./DevTools/.build/release
+          key: ${{ runner.os }}-DevTools-${{ matrix.xcode }}-${{ hashFiles('./DevTools/Package.resolved') }}
+          restore-keys: |
+            ${{ runner.os }}-DevTools-${{ matrix.xcode }}-${{ hashFiles('./DevTools/Package.resolved') }}
+            ${{ runner.os }}-DevTools-${{ matrix.xcode }}-
+      - name: Install DevTools
+        run: |
+          if [ ! -e ./DevTools/.build/release/xcbeautify ]; then
+            make dev
+          fi
       - name: Cache dependencies
         uses: actions/cache@v2
         with:
           path: |
             .build/artifacts
             .build/checkouts
             .build/repositories
-          key: ${{ runner.os }}-dependencies-${{ matrix.xcode }}-${{ hashFiles('**/Package.resolved') }}
+          key: ${{ runner.os }}-dependencies-${{ matrix.xcode }}-${{ hashFiles('./Package.resolved') }}
           restore-keys: |
-            ${{ runner.os }}-dependencies-${{ matrix.xcode }}-${{ hashFiles('**/Package.resolved') }}
+            ${{ runner.os }}-dependencies-${{ matrix.xcode }}-${{ hashFiles('./Package.resolved') }}
             ${{ runner.os }}-dependencies-${{ matrix.xcode }}-
       - name: Test
-        run: swift test
+        run: make test
   linux:
     strategy:
       fail-fast: false
@@ -66,6 +80,20 @@ jobs:
         run: |
           echo "::set-output name=version::$(swift -version | head -n 1 | sed s/,// )"
         shell: bash
+      - name: Cache DevTools
+        uses: actions/cache@v2
+        with:
+          path: |
+            ./DevTools/.build/release
+          key: ${{ matrix.cache-version }}-${{ runner.os }}-${{ steps.get-swift-version.outputs.version }}}-DevTools-${{ hashFiles('./DevTools/Package.resolved') }}
+          restore-keys: |
+            ${{ matrix.cache-version }}-${{ runner.os }}-${{ steps.get-swift-version.outputs.version }}}-DevTools-${{ hashFiles('./DevTools/Package.resolved') }}
+            ${{ matrix.cache-version }}-${{ runner.os }}-${{ steps.get-swift-version.outputs.version }}}-DevTools-
+      - name: Install DevTools
+        run: |
+          if [ ! -e ./DevTools/.build/release/xcbeautify ]; then
+            make dev
+          fi
       - name: Cache dependencies
         uses: actions/cache@v2
         with:

diff --git a/Makefile b/Makefile
@@ -1,10 +1,11 @@
 SWIFT = $(shell which swift)
 DEV_TOOLS_BUILD_FLAGS = --configuration release --package-path ./DevTools
+XCBEAUTIFY_EXECUTABLE = ./DevTools/.build/release/xcbeautify
 
 .PHONY: dev
 dev:
 	$(SWIFT) build $(DEV_TOOLS_BUILD_FLAGS) --product xcbeautify
 
 .PHONY: test
 test:
-	$(SWIFT) test 2>&1 | xcbeautify
+	$(SWIFT) test 2>&1 | $(XCBEAUTIFY_EXECUTABLE)