Merge dev into main #1
+19
-3
@@ -1,5 +1,4 @@
|
|||||||
when:
|
when:
|
||||||
branch: main
|
|
||||||
event: [push, manual]
|
event: [push, manual]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
@@ -20,7 +19,7 @@ steps:
|
|||||||
- cd client && npm run build
|
- cd client && npm run build
|
||||||
depends_on: [install]
|
depends_on: [install]
|
||||||
|
|
||||||
deploy:
|
deploy-main:
|
||||||
image: alpine:latest
|
image: alpine:latest
|
||||||
environment:
|
environment:
|
||||||
DEPLOY_KEY:
|
DEPLOY_KEY:
|
||||||
@@ -30,5 +29,22 @@ steps:
|
|||||||
- mkdir -p /ssh
|
- mkdir -p /ssh
|
||||||
- echo "$DEPLOY_KEY" > /ssh/deploy_key
|
- echo "$DEPLOY_KEY" > /ssh/deploy_key
|
||||||
- chmod 600 /ssh/deploy_key
|
- chmod 600 /ssh/deploy_key
|
||||||
- rsync -e "ssh -i /ssh/deploy_key -o StrictHostKeyChecking=no" -avz --delete client/dist/ root@192.168.1.88:/var/www/
|
- rsync -e "ssh -i /ssh/deploy_key -o StrictHostKeyChecking=no" -avz --delete --exclude '*.db' client/dist/ root@192.168.1.88:/var/www/
|
||||||
depends_on: [lint, build]
|
depends_on: [lint, build]
|
||||||
|
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 '*.db' client/dist/ root@192.168.1.118:/var/www/
|
||||||
|
depends_on: [lint, build]
|
||||||
|
when:
|
||||||
|
branch: dev
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
trigger-1781703619
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
trigger-1781703863
|
||||||
Reference in New Issue
Block a user