From 4792105e013310da431d682615f4108d92e603b8 Mon Sep 17 00:00:00 2001
From: Vasilii Mikhailovskii <ti.webdev@ya.ru>
Date: Mon, 2 Dec 2024 17:02:04 +0200
Subject: [PATCH] change ci/cd

---
 .gitea/workflows/deploy.yaml | 46 +++++++++++++++++++++++-------------
 package.json                 |  2 +-
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 629fd99..5bcf24b 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -21,18 +21,23 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: '22'
-      - name: Cache apt packages
-        uses: actions/cache@v3
+      - name: Set up Bun
+        uses: oven-sh/setup-bun@v1
         with:
-          path: /var/cache/apt
-          key: ${{ runner.os }}-apt-cache
-          restore-keys: ${{ runner.os }}-apt-cache
-      - name: Cache pnpm dependencies
-        uses: actions/cache@v3
-        with:
-          path: ~/.pnpm-store
-          key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: ${{ runner.os }}-pnpm-
+          bun-version: 'latest' # или укажите конкретную версию, например, '1.0.0'
+
+#      - name: Cache apt packages
+#        uses: actions/cache@v3
+#        with:
+#          path: /var/cache/apt
+#          key: ${{ runner.os }}-apt-cache
+#          restore-keys: ${{ runner.os }}-apt-cache
+#      - name: Cache pnpm dependencies
+#        uses: actions/cache@v3
+#        with:
+#          path: ~/.pnpm-store
+#          key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
+#          restore-keys: ${{ runner.os }}-pnpm-
 
       - name: install zopfli & brotli
         run: apt update && apt install -y zopfli brotli
@@ -43,19 +48,26 @@ jobs:
           pnpm deploy --filter frontend --frozen-lockfile build/frontend
 
       - name: build production
-        run: cd build/frontend && npm run build-only -- --emptyOutDir --outDir /www/hereconnect.condev.ru/build-${{env.GITHUB_SHA}}-prod/
+        run: cd build/frontend && bun run build-only -- --emptyOutDir --outDir /www/hereconnect.condev.ru/build-${{env.GITHUB_SHA}}-prod/
+
+#      - name: compress production with Brotli
+#        run: |
+#          find /www/hereconnect.condev.ru/build-${{env.GITHUB_SHA}}-prod/ -type f \( -name '*.js' -o -name '*.css' -o -name '*.html' -o -name '*.svg' -o -name '*.eot' -o -name '*.ttf' -o -name '*.woff' -o -name '*.woff2' \) | while read -r file; do
+#            brotli -k -q 11 "$file"
+#          done
 
       - name: compress production with Brotli
-        run: |
-          find /www/hereconnect.condev.ru/build-${{env.GITHUB_SHA}}-prod/ -type f \( -name '*.js' -o -name '*.css' -o -name '*.html' -o -name '*.svg' -o -name '*.eot' -o -name '*.ttf' -o -name '*.woff' -o -name '*.woff2' \) | while read -r file; do
-            brotli -k -q 11 "$file"
-          done
+        uses: StefH/ghaction-CompressFiles@v2
+        with:
+          path: /www/hereconnect.condev.ru/build-${{env.GITHUB_SHA}}-prod/
+          extensions: '.css,.html,.js,.svg,.eot,.ttf,.woff,.woff2'
+          tools: 'brotli'
 
       - name: deploy production
         run:  mv -v /www/hereconnect.condev.ru/current-prod /www/hereconnect.condev.ru/old-prod && mv -v /www/hereconnect.condev.ru/build-${{env.GITHUB_SHA}}-prod /www/hereconnect.condev.ru/current-prod && rm -rf /www/hereconnect.condev.ru/old-prod
 
       - name: build dev
-        run: cd build/frontend && NODE_OPTIONS="--max-old-space-size=4096" npm run build-only -- --emptyOutDir --mode development --outDir /www/hereconnect.condev.ru/build-${{env.GITHUB_SHA}}-dev/
+        run: cd build/frontend && NODE_OPTIONS="--max-old-space-size=4096" bun run build-only -- --emptyOutDir --mode development --outDir /www/hereconnect.condev.ru/build-${{env.GITHUB_SHA}}-dev/
 
       - name: deploy dev
         run: mv -v /www/hereconnect.condev.ru/current-dev /www/hereconnect.condev.ru/old-dev && mv -v /www/hereconnect.condev.ru/build-${{env.GITHUB_SHA}}-dev /www/hereconnect.condev.ru/current-dev && rm -rf /www/hereconnect.condev.ru/old-dev
diff --git a/package.json b/package.json
index 4806010..654c1dd 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "node": ">=v20.10.0",
     "pnpm": ">=8.15.9"
   },
-  "packageManager": "pnpm@8.15.9",
+  "packageManager": "pnpm@8.15.9+sha512.499434c9d8fdd1a2794ebf4552b3b25c0a633abcee5bb15e7b5de90f32f47b513aca98cd5cfd001c31f0db454bc3804edccd578501e4ca293a6816166bbd9f81",
   "workspaces": {
     "packages": [
       "apps/*",