Merge remote-tracking branch 'origin/dev'

.woodpecker/.woodpecker.yml

@@ -1,30 +1,41 @@
-when:
-  branch: main
-  event: push
-
-steps:
-  install:
-    image: node:20
-    commands:
-      - npm ci
-
-  lint:
-    image: node:20
-    commands:
-      - npm run lint
-    depends_on: [install]
-
-  build:
-    image: node:20
-    commands:
-      - npm run build
-    depends_on: [install]
-
-  deploy:
-    image: alpine:latest
-    commands:
-      - apk add --no-cache openssh rsync
-      - rsync -e "ssh -i /ssh/deploy_key" -avz --delete dist/ root@192.168.1.88:/srv/shop/
-      - ssh -i /ssh/deploy_key root@192.168.1.88 'systemctl restart shop-server'
-    secrets: [deploy_key]
-    depends_on: [lint, build]
+when:
+  event: [push, manual]
+
+steps:
+  install:
+    image: node:20
+    commands:
+      - cd server && npm install
+
+  deploy-main:
+    image: alpine:latest
+    environment:
+      DEPLOY_KEY:
+        from_secret: deploy_key
+    commands:
+      - apk add --no-cache openssh rsync
+      - mkdir -p /ssh
+      - echo "$DEPLOY_KEY" > /ssh/deploy_key
+      - chmod 600 /ssh/deploy_key
+      - rsync -e "ssh -i /ssh/deploy_key -o StrictHostKeyChecking=no" -avz --delete --exclude node_modules --exclude .env --exclude .dev_env --exclude uploads --exclude '*.db' ./server/ root@192.168.1.88:/opt/shop/server/server/
+      - ssh -i /ssh/deploy_key -o StrictHostKeyChecking=no root@192.168.1.88 "cd /opt/shop/server/server && npm ci 2>&1 | tail -3 && npx prisma generate 2>&1 | tail -2 && npx prisma migrate deploy 2>&1 | tail -5 && systemctl restart shop-server"
+    depends_on: [install]
+    when:
+      branch: main
+
+  deploy-dev:
+    image: alpine:latest
+    environment:
+      DEPLOY_KEY:
+        from_secret: deploy_key
+    commands:
+      - apk add --no-cache openssh rsync
+      - mkdir -p /ssh
+      - echo "$DEPLOY_KEY" > /ssh/deploy_key
+      - chmod 600 /ssh/deploy_key
+      - rsync -e "ssh -i /ssh/deploy_key -o StrictHostKeyChecking=no" -avz --delete --exclude node_modules --exclude .env --exclude .dev_env --exclude uploads --exclude '*.db' ./server/ root@192.168.1.118:/opt/shop/server/server/
+      - rsync -e "ssh -i /ssh/deploy_key -o StrictHostKeyChecking=no" -avz --delete --exclude .git --exclude node_modules ./shared/ root@192.168.1.118:/opt/shop/server/shared/
+      - ssh -i /ssh/deploy_key -o StrictHostKeyChecking=no root@192.168.1.118 "cd /opt/shop/server/server && npm ci 2>&1 | tail -3 && npx prisma generate 2>&1 | tail -2 && npx prisma migrate deploy 2>&1 | tail -5 && systemctl restart shop-server"
+    depends_on: [install]
+    when:
+      branch: dev

test-server-dev.txt

@@ -0,0 +1 @@
+trigger-1781703952