From 1cec9f3c3e87f76b9203f26ff4150f38659d5c74 Mon Sep 17 00:00:00 2001
From: Fredrik <freddahf@outlook.com>
Date: Sat, 2 Nov 2024 08:50:43 +0100
Subject: [PATCH] fix: Fix ci

---
 .github/workflows/ci.yml |  2 +-
 Makefile                 | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4883edc..928c2d3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ env:
 
 jobs:
   build:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
diff --git a/Makefile b/Makefile
index 4bf02b8..5c609be 100644
--- a/Makefile
+++ b/Makefile
@@ -14,22 +14,21 @@ build:
 
 test: build
 	docker compose -f docker-compose.yaml up --wait
-	cargo install cargo-nextest
-	cd backend && cargo nextest run
+	cd backend && cargo t
 	docker compose -f docker-compose.yaml down
 
 docker_login:
 	docker login ghcr.io -u $(GITHUB_USER) -p $(GITHUB_TOKEN)
 
-backend_container: docker_login
+backend_container:
 	cd backend && docker build -t ghcr.io/$(GITHUB_USER)/$(PROJECT_NAME)_backend:latest .
 
-frontend_container: docker_login
+frontend_container:
 	cd frontend && docker build -t ghcr.io/$(GITHUB_USER)/$(PROJECT_NAME)_frontend:latest .
 
-containers: backend_container frontend_container test
+containers: test backend_container frontend_container
 
-publish_containers: containers
+publish_containers: docker_login containers
 	docker push ghcr.io/$(GITHUB_USER)/$(PROJECT_NAME)_backend:latest
 	docker push ghcr.io/$(GITHUB_USER)/$(PROJECT_NAME)_frontend:latest