Merge branch 'dev' into till-dev

.github/workflows/cd-staging-tagged.yml

@@ -21,10 +21,7 @@ on:
           - zitare
           - presi
           - mana-core-auth
-          - manacore
           - todo
-          - calendar
-          - clock
       apps:
         description: 'Apps to deploy (comma-separated: backend,web,landing or "all")'
         required: true
@@ -109,10 +106,7 @@ jobs:
           PROJECT_APPS[zitare]="backend,web"
           PROJECT_APPS[presi]="backend,web"
           PROJECT_APPS[mana-core-auth]="service"
-          PROJECT_APPS[manacore]="web"
           PROJECT_APPS[todo]="backend,web"
-          PROJECT_APPS[calendar]="backend,web"
-          PROJECT_APPS[clock]="backend,web"
 
           # Expand "all" to available apps
           if [ "$APPS" == "all" ]; then
@@ -171,8 +165,6 @@ jobs:
                   manadeck) PORT="3009" ;;
                   zitare) PORT="3007" ;;
                   presi) PORT="3008" ;;
-                  calendar) PORT="3016" ;;
-                  clock) PORT="3017" ;;
                   todo) PORT="3018" ;;
                 esac
 
@@ -353,7 +345,8 @@ jobs:
             if grep -q "^$VERSION_VAR=" .env 2>/dev/null; then
               sed -i "s/^$VERSION_VAR=.*/$VERSION_VAR=$VERSION/" .env
             else
-              echo "$VERSION_VAR=$VERSION" >> .env
+              echo "Service \$SERVICE_NAME not found in compose, starting..."
+              docker compose up -d --force-recreate \$SERVICE_NAME
             fi
 
             echo "Updated .env: $VERSION_VAR=$VERSION"

.github/workflows/ci.yml

@@ -17,24 +17,6 @@ on:
     branches:
       - main
       - dev
-    paths:
-      - 'apps/**'
-      - 'packages/**'
-      - 'services/**'
-      - 'package.json'
-      - 'pnpm-lock.yaml'
-      - 'turbo.json'
-  pull_request:
-    branches:
-      - main
-      - dev
-    paths:
-      - 'apps/**'
-      - 'packages/**'
-      - 'services/**'
-      - 'package.json'
-      - 'pnpm-lock.yaml'
-      - 'turbo.json'
   workflow_dispatch:
 
 concurrency:
@@ -86,13 +68,8 @@ jobs:
           - { name: 'mana-core-auth', path: 'services/mana-core-auth', port: '3001' }
           - { name: 'chat-backend', path: 'apps/chat/apps/backend', port: '3002' }
           - { name: 'chat-web', path: 'apps/chat/apps/web', port: '3000' }
-          - { name: 'manacore-web', path: 'apps/manacore/apps/web', port: '5173' }
           - { name: 'todo-backend', path: 'apps/todo/apps/backend', port: '3018' }
           - { name: 'todo-web', path: 'apps/todo/apps/web', port: '5188' }
-          - { name: 'calendar-backend', path: 'apps/calendar/apps/backend', port: '3016' }
-          - { name: 'calendar-web', path: 'apps/calendar/apps/web', port: '5186' }
-          - { name: 'clock-backend', path: 'apps/clock/apps/backend', port: '3017' }
-          - { name: 'clock-web', path: 'apps/clock/apps/web', port: '5187' }
       fail-fast: false
     steps:
       - name: Checkout code