fix: Fix ci

Frixxie · Nov 2, 2024 · 1cec9f3 · 1cec9f3
1 parent b8eea99
commit 1cec9f3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git 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
@@ -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