Cleanup folders & hotfixes on ci/cd

.gitea/workflows/docker.yaml

@@ -10,26 +10,36 @@ jobs:
   test-backend:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+    - name: Setup Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '20'
+        cache: 'npm'
     - name: Install dependencies
-      run: cd backend && npm ci
+      run: npm ci
     - name: Run tests
-      run: cd backend && npm test -- --ci
+      run: npm test --workspace=farma-clic-backend -- --ci
 
   test-frontend:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+    - name: Setup Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '20'
+        cache: 'npm'
     - name: Install dependencies
-      run: cd frontend && npm ci
+      run: npm ci
     - name: Run tests
-      run: cd frontend && npm test -- --run --reporter=basic
+      run: npm test --workspace=farma-clic-frontend -- --run --reporter=basic
 
   build-backend:
     needs: [ test-backend, test-frontend ]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Log in to Gitea registry
       uses: docker/login-action@v3
       with:
@@ -40,7 +50,7 @@ jobs:
       uses: docker/build-push-action@v5
       with:
         context: .
-        file: ./backend/Dockerfile
+        file: ./apps/backend/Dockerfile
         push: true
         tags: |
           git.hacecalor.net/ichitux/farmafinder-backend:latest
@@ -50,7 +60,7 @@ jobs:
     needs: [ test-backend, test-frontend ]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Log in to Gitea registry
       uses: docker/login-action@v3
       with:
@@ -60,14 +70,14 @@ jobs:
     - name: Build and push frontend image
       uses: docker/build-push-action@v5
       with:
-        context: ./frontend
+        context: ./apps/frontend
         push: true
         tags: |
           git.hacecalor.net/ichitux/farmafinder-frontend:latest
           git.hacecalor.net/ichitux/farmafinder-frontend:${{ gitea.sha }}
 
   deploy:
-    needs: [ build ]
+    needs: [ build-backend, build-frontend ]
     runs-on: ubuntu-latest
     steps:
     - name: SSH to remote server

.gitea/workflows/test-branches.yaml

@@ -11,37 +11,35 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '20'
           cache: 'npm'
-          cache-dependency-path: backend/package-lock.json
 
-      - name: Install Backend Dependencies
-        run: cd backend && npm ci
+      - name: Install Dependencies
+        run: npm ci
 
       - name: Run Backend Tests
-        run: cd backend && npm test -- --ci
+        run: npm test --workspace=farma-clic-backend -- --ci
 
   test-frontend:
     name: Frontend Tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '20'
           cache: 'npm'
-          cache-dependency-path: frontend/package-lock.json
 
-      - name: Install Frontend Dependencies
-        run: cd frontend && npm ci
+      - name: Install Dependencies
+        run: npm ci
 
       - name: Run Frontend Tests
-        run: cd frontend && npm test -- --run --reporter=basic
+        run: npm test --workspace=farma-clic-frontend -- --run --reporter=basic