Cache .build after building tests, before running them

Author: finestructure

.github/workflows/ci.yml

@@ -51,17 +51,20 @@ jobs:
           key: "spi-debug-build-${{ runner.os }}-${{ github.event.after }}"
           restore-keys: "spi-debug-build-${{ runner.os }}-"
 
-      - name: Run tests
-        run: cp .env.testing.template .env.testing && make test
-        env:
-          COLLECTION_SIGNING_PRIVATE_KEY: ${{ secrets.COLLECTION_SIGNING_PRIVATE_KEY }}
+      - name: Build tests
+        run: cp .env.testing.template .env.testing && make build-tests
 
       - name: Cache .build
         if: steps.restore-cache.outputs.cache-hit != 'true'
         uses: actions/cache/save@v4
         with:
           path: .build
           key: "spi-debug-build-${{ runner.os }}-${{ github.event.after }}"
+
+      - name: Run tests
+        run: cp .env.testing.template .env.testing && make run-tests
+        env:
+          COLLECTION_SIGNING_PRIVATE_KEY: ${{ secrets.COLLECTION_SIGNING_PRIVATE_KEY }}
 
     services:
       spi_test_0:

Makefile

@@ -30,16 +30,25 @@ endif
 build:
 	swift build --disable-automatic-resolution --enable-experimental-prebuilts
 
-
 run:
 	swift run
 
-test: xcbeautify
+build-tests: xcbeautify
+	set -o pipefail \
+	&& swift build --build-tests \
+	--disable-automatic-resolution \
+	--enable-experimental-prebuilts \
+	2>&1 | xcbeautify --renderer github-actions
+
+run-tests: xcbeautify
 	set -o pipefail \
-	&& swift test --disable-automatic-resolution \
+	&& swift test --skip-build \
+	--disable-automatic-resolution \
 	--enable-experimental-prebuilts \
 	2>&1 | xcbeautify --renderer github-actions
 
+test: build-tests run-tests
+
 test-query-performance: xcbeautify
 	set -o pipefail \
 	&& env RUN_QUERY_PERFORMANCE_TESTS=true \