Compare commits

..

57 Commits

Author SHA1 Message Date
admin e90644835f Merge pull request 'del gitea' (#2) from dev into main
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #2
2026-06-17 16:56:36 +00:00
@kirill.komarov 8c7324c17f del gitea
ci/woodpecker/push/woodpecker Pipeline was successful
2026-06-17 21:54:39 +05:00
@kirill.komarov e1f7831f1f del gitea
ci/woodpecker/push/woodpecker Pipeline was successful
2026-06-17 21:47:49 +05:00
admin c4f71c0f21 Merge pull request 'Merge dev into main' (#1) from dev into main
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/manual/woodpecker Pipeline was successful
Merge dev into main
2026-06-17 16:37:16 +00:00
admin c7a64d98c0 fix: preserve db from --delete
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/manual/woodpecker Pipeline was successful
2026-06-17 15:25:34 +00:00
admin 3b9ff972e0 fix: preserve db from --delete
ci/woodpecker/push/woodpecker Pipeline was successful
2026-06-17 15:25:33 +00:00
admin 64f0236d52 fix: use npm install instead of npm ci
ci/woodpecker/push/woodpecker Pipeline was successful
2026-06-17 13:46:48 +00:00
admin edc8606295 test: retry with npm install
ci/woodpecker/push/woodpecker Pipeline was successful
2026-06-17 13:44:23 +00:00
admin e021e4abd1 fix: use npm install instead of npm ci
ci/woodpecker/push/woodpecker Pipeline was canceled
2026-06-17 13:44:05 +00:00
admin de822e79a4 fix: use npm install instead of npm ci
ci/woodpecker/push/woodpecker Pipeline was canceled
2026-06-17 13:43:52 +00:00
admin 17ce1dc657 fix: use npm install instead of npm ci
ci/woodpecker/push/woodpecker Pipeline was canceled
2026-06-17 13:43:25 +00:00
admin aa44c265a9 fix: use npm install
ci/woodpecker/push/woodpecker Pipeline was canceled
2026-06-17 13:43:06 +00:00
admin f1d77f5105 test: trigger dev pipeline
ci/woodpecker/push/woodpecker Pipeline failed
2026-06-17 13:40:19 +00:00
admin 8d391ae079 feat: add dev pipeline with branch-specific deploy 2026-06-17 13:28:54 +00:00
admin 848bb83256 feat: add dev pipeline with branch-specific deploy 2026-06-17 13:28:21 +00:00
admin 9cc89908d6 feat: add dev pipeline with branch-specific deploy 2026-06-17 13:27:27 +00:00
@kirill.komarov 5fd45dd0c2 del gitea 2026-06-17 14:05:10 +05:00
@kirill.komarov 748749159f Merge branch 'main' of https://gitea.mpak-8501.ru/admin/shop-client 2026-06-17 14:03:07 +05:00
@kirill.komarov 95446263e7 del gitea 2026-06-17 14:03:01 +05:00
admin ca352cb1a8 clean 2026-06-17 08:54:48 +00:00
admin ad31e2cb0f fix 2026-06-17 08:44:02 +00:00
admin bc8cd6888e hook2 2026-06-17 08:33:48 +00:00
admin d69dae0863 webhook_ok 2026-06-17 08:33:16 +00:00
admin 607144f37f work 2026-06-17 08:32:08 +00:00
admin 57f31b27c5 last 2026-06-17 08:31:31 +00:00
admin 5152778155 hookfix 2026-06-17 08:28:47 +00:00
@kirill.komarov e276ced645 del gitea
ci/woodpecker/manual/woodpecker Pipeline was canceled
2026-06-17 13:26:41 +05:00
@kirill.komarov 8ad7de722b Merge branch 'main' of https://gitea.mpak-8501.ru/admin/shop-client 2026-06-17 13:24:51 +05:00
@kirill.komarov 0c6fd1abbf del gitea 2026-06-17 13:24:44 +05:00
admin 024c4fe116 final 2026-06-17 08:20:55 +00:00
@kirill.komarov 7ee247ce5d del gitea 2026-06-17 13:19:44 +05:00
@kirill.komarov ae852a250e Merge branch 'main' of https://gitea.mpak-8501.ru/admin/shop-client 2026-06-17 13:14:53 +05:00
@kirill.komarov da36fc3dba del gitea 2026-06-17 13:14:45 +05:00
admin c613305585 autotest2 2026-06-17 08:13:06 +00:00
@kirill.komarov c6a97a1b9a del gitea 2026-06-17 13:12:35 +05:00
@kirill.komarov b23a0851e4 del gitea
ci/woodpecker/manual/woodpecker Pipeline was successful
2026-06-17 13:10:12 +05:00
@kirill.komarov a87733f318 del gitea 2026-06-17 13:08:53 +05:00
@kirill.komarov 1fec877b90 del gitea 2026-06-17 13:07:12 +05:00
@kirill.komarov ebf24ae77a Merge branch 'main' of https://gitea.mpak-8501.ru/admin/shop-client 2026-06-17 13:00:23 +05:00
@kirill.komarov fcec3c6620 del gitea 2026-06-17 13:00:16 +05:00
admin 2caa8d91be autotest 2026-06-17 07:58:59 +00:00
@kirill.komarov 148966ce5b del gitea 2026-06-17 12:57:28 +05:00
@kirill.komarov 2b3f07d984 del gitea
ci/woodpecker/manual/woodpecker Pipeline was successful
2026-06-17 12:40:44 +05:00
@kirill.komarov eb505b5ca2 del gitea
ci/woodpecker/manual/woodpecker Pipeline failed
2026-06-17 12:33:48 +05:00
@kirill.komarov 621414d13c del gitea 2026-06-17 12:31:53 +05:00
@kirill.komarov 62b1e63667 del gitea
ci/woodpecker/manual/woodpecker Pipeline was canceled
2026-06-17 12:28:15 +05:00
@kirill.komarov 4319edca0c del gitea
ci/woodpecker/manual/woodpecker Pipeline failed
2026-06-16 22:52:31 +05:00
@kirill.komarov 0382abe819 del gitea
ci/woodpecker/manual/woodpecker Pipeline failed
2026-06-16 22:43:02 +05:00
@kirill.komarov 1d0bf86fee del gitea
ci/woodpecker/manual/woodpecker Pipeline failed
2026-06-16 22:41:05 +05:00
@kirill.komarov a56e1226ba del gitea 2026-06-16 22:39:00 +05:00
@kirill.komarov 19fdd24b8e del gitea 2026-06-16 22:33:54 +05:00
@kirill.komarov 12a2e7a865 del gitea
ci/woodpecker/manual/woodpecker Pipeline was successful
2026-06-16 22:32:48 +05:00
@kirill.komarov ba8ea99134 del gitea 2026-06-16 22:30:57 +05:00
@kirill.komarov c52152a78b del gitea
ci/woodpecker/manual/woodpecker Pipeline was successful
2026-06-16 22:30:22 +05:00
@kirill.komarov b0d8f19e76 del gitea 2026-06-16 22:29:42 +05:00
@kirill.komarov 5acea72769 Merge branch 'main' of https://gitea.mpak-8501.ru/admin/shop-client 2026-06-16 22:27:47 +05:00
@kirill.komarov ba0d62d028 del gitea 2026-06-16 22:27:13 +05:00
6 changed files with 52 additions and 33 deletions
+50
View File
@@ -0,0 +1,50 @@
when:
event: [push, manual]
steps:
install:
image: node:20
commands:
- cd client && npm install
lint:
image: node:20
commands:
- cd client && npm run lint
depends_on: [install]
build:
image: node:20
commands:
- cd client && npm run build
depends_on: [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 '*.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
-30
View File
@@ -1,30 +0,0 @@
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]
+1 -1
View File
@@ -1,3 +1,3 @@
# shop-client
---
Test CI_n
@@ -85,6 +85,7 @@ const sections = [
export function PrivacyPolicyPage() {
usePageTitle('Политика конфиденциальности')
return (
<Box sx={{ maxWidth: 800, mx: 'auto', py: { xs: 3, md: 5 }, px: { xs: 2, md: 0 } }}>
<Typography
-1
View File
@@ -1 +0,0 @@
test
-1
View File
@@ -1 +0,0 @@
t