Compare commits
24 Commits
ae852a250e
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
| 8c7324c17f | |||
| c7a64d98c0 | |||
| edc8606295 | |||
| e021e4abd1 | |||
| de822e79a4 | |||
| 17ce1dc657 | |||
| aa44c265a9 | |||
| f1d77f5105 | |||
| 9cc89908d6 | |||
| 5fd45dd0c2 | |||
| 748749159f | |||
| 95446263e7 | |||
| ca352cb1a8 | |||
| ad31e2cb0f | |||
| bc8cd6888e | |||
| d69dae0863 | |||
| 607144f37f | |||
| 57f31b27c5 | |||
| 5152778155 | |||
| e276ced645 | |||
| 8ad7de722b | |||
| 0c6fd1abbf | |||
| 024c4fe116 | |||
| 7ee247ce5d |
+19
-3
@@ -1,5 +1,4 @@
|
||||
when:
|
||||
branch: main
|
||||
event: [push, manual]
|
||||
|
||||
steps:
|
||||
@@ -20,7 +19,7 @@ steps:
|
||||
- cd client && npm run build
|
||||
depends_on: [install]
|
||||
|
||||
deploy:
|
||||
deploy-main:
|
||||
image: alpine:latest
|
||||
environment:
|
||||
DEPLOY_KEY:
|
||||
@@ -30,5 +29,22 @@ steps:
|
||||
- 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 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]
|
||||
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
|
||||
|
||||
@@ -86,7 +86,7 @@ const sections = [
|
||||
export function PrivacyPolicyPage() {
|
||||
usePageTitle('Политика конфиденциальности')
|
||||
// eslint-disable-next-line no-console
|
||||
console.log('new deploy44')
|
||||
console.log('new deploy16')
|
||||
return (
|
||||
<Box sx={{ maxWidth: 800, mx: 'auto', py: { xs: 3, md: 5 }, px: { xs: 2, md: 0 } }}>
|
||||
<Typography
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
t
|
||||
@@ -1 +0,0 @@
|
||||
test
|
||||
@@ -1 +0,0 @@
|
||||
t
|
||||
@@ -1 +0,0 @@
|
||||
t
|
||||
Reference in New Issue
Block a user