From 4024bb624fea2fcbdf40899cee9d255d5c526abd Mon Sep 17 00:00:00 2001
From: Michael Housh <mhoush@houshhomeenergy.com>
Date: Thu, 14 Nov 2024 18:39:10 -0500
Subject: [PATCH] feat: Run CI

---
 .gitea/workflows/ci.yaml | 13 +++++++++++--
 Dockerfile.test          |  1 +
 Makefile                 |  2 --
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml
index 795b684..6f9324d 100644
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -23,12 +23,21 @@ jobs:
             -p "8081:8081" \
             eclipse-mosquitto:latest
       - name: Build the test image.
-        run: docker buildx build -f Dockerfile.test -t ${{ gitea.repository }}:test .
+        uses: docker/build-and-push@v5
+        with:
+          context: .
+          file: Dockerfile.test
+          platforms: |
+            linux/arm64
+            linux/amd64
+          push: true
+          tags: |
+            gitea.housh.dev/michael/${{ gitea.repository }}:${{ gitea.sha }}
       - name: Run Test
         run: >
           docker run --rm \
             -e MOSQUITTO_SERVER=127.0.0.1 \
-            ${{ gitea.repository }}:test \
+            gitea.housh.dev/michael/${{ gitea.repository }}:${{ gitea.sha }} \
             swift test
       - name: Cleanup.
         if: always()
diff --git a/Dockerfile.test b/Dockerfile.test
index 38ad7e9..a3fa111 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -3,4 +3,5 @@ WORKDIR /app
 COPY ./Package.* ./
 RUN swift package resolve
 COPY . .
+RUN swift build
 CMD ["/bin/bash", "-xc", "swift", "test"]
diff --git a/Makefile b/Makefile
index d4ee37f..ea8a0ed 100755
--- a/Makefile
+++ b/Makefile
@@ -26,5 +26,3 @@ test-docker:
 	@docker-compose run --build --remove-orphans -i --rm test
 	@docker-compose kill mosquitto-test
 	@docker-compose rm -f
-
-test: test-docker