Merge branch 'master' of https://github.com/MartCube/FireON

MartCube · Jan 2, 2025 · ef84344 · ef84344
2 parents aabfbac + 5ab039a
commit ef84344
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 18 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,17 +1,37 @@
 # https://github.com/actions/deploy-pages#usage
-name: deploy_to_ukraina_com_ua
+name: deploy_to_ukraina_com_ua_main
 on:
   workflow_dispatch:
   repository_dispatch:
     types: 
-      - deploy_to_ukraina_com_ua
+      - deploy_to_ukraina_com_ua_main
   push:
     branches:
       - master
 jobs:
-  build:
+  build_main:
     runs-on: ubuntu-latest
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}  # Unique group for each branch
+      cancel-in-progress: true  # Cancel in-progress runs of the same group
+
     steps:
+     # Step 1: Установка Node.js версии 18
+      - name: Set up Node.js 18
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18  # Указываем версию Node.js
+
+      # Step 2: Checkout репозитория
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      # Step 3: Установка зависимостей и сборка
+      - name: Install Dependencies and Build
+        run: |
+          npm install --legacy-per-deps
+          npm nuxt build  # Сборка проекта
+          
       - uses: actions/checkout@v4
       - name: Deploy with rsync
         uses: burnett01/rsync-deployments@7.0.1
@@ -22,19 +42,6 @@ jobs:
           remote_user: ${{ secrets.REMOTE_USER }}
           remote_key: ${{ secrets.REMOTE_KEY }}
           remote_path: ${{ secrets.REMOTE_PATH }}  
-      - name: Deploy
-        uses: appleboy/ssh-action@v1.2.0
-        with:
-          host: ${{ secrets.REMOTE_HOST }}
-          username: ${{ secrets.REMOTE_USER }}
-          key: ${{ secrets.REMOTE_KEY }}
-          port: ${{ secrets.PORT }}
-          script: |
-            cd /home/cyclone/fireon.com.ua/www/
-            rm -rf node_modules package-lock.json
-            ls
-            nvm use 18
-            nvm install-latest-npm
-            npm install
-            npx nuxt build
+
+
 
diff --git a/.github/workflows/poland.yml b/.github/workflows/poland.yml
@@ -0,0 +1,46 @@
+# https://github.com/actions/deploy-pages#usage
+name: deploy_to_ukraina_com_ua_poland
+on:
+  workflow_dispatch:
+  repository_dispatch:
+    types: 
+      - deploy_to_ukraina_com_ua_poland
+  push:
+    branches:
+      - poland
+jobs:      
+  build: 
+    runs-on: ubuntu-latest
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}  # Unique group for each branch
+      cancel-in-progress: true  # Cancel in-progress runs of the same group
+
+    steps:
+     # Step 1: Установка Node.js версии 18
+      - name: Set up Node.js 18
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18  # Указываем версию Node.js
+
+      # Step 2: Checkout репозитория
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      # Step 3: Установка зависимостей и сборка
+      - name: Install Dependencies and Build
+        run: |
+          npm install --legacy-per-deps
+          npm nuxt build  # Сборка проекта
+          
+      - uses: actions/checkout@v4
+      - name: Deploy with rsync
+        uses: burnett01/rsync-deployments@7.0.1
+        with:
+          switches: -avzr --delete
+          path: .
+          remote_host: ${{ secrets.REMOTE_HOST }}
+          remote_user: ${{ secrets.REMOTE_USER }}
+          remote_key: ${{ secrets.REMOTE_KEY }}
+          remote_path: ${{ secrets.REMOTE_PATH_POLAND }}  
+
+