From 650ec355895864c71152ca6aaedca2d853f03098 Mon Sep 17 00:00:00 2001
From: liguobao <codelover@qq.com>
Date: Wed, 28 Feb 2024 12:08:25 +0800
Subject: [PATCH] feat: merge newUI

---
 .github/workflows/new.ui.yml  | 43 -----------------------------------
 .github/workflows/node.js.yml |  6 ++---
 2 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 .github/workflows/new.ui.yml

diff --git a/.github/workflows/new.ui.yml b/.github/workflows/new.ui.yml
deleted file mode 100644
index 94494ebc..00000000
--- a/.github/workflows/new.ui.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
-
-name: Node.js CI
-
-on:
-  push:
-    branches: [ "develop" ]
-  pull_request:
-    branches: [ "develop" ]
-
-jobs:  
-    build:  
-      runs-on: ubuntu-latest  
-    
-      steps:  
-      - name: Checkout code  
-        uses: actions/checkout@v2  
-    
-      - name: Set up Node.js  
-        uses: actions/setup-node@v2  
-        with:  
-          node-version: '10'  
-    
-      - name: Install dependencies  
-        run: npm install  
-        working-directory: ./House-Map.newUI
-    
-      - name: Build  
-        run: npm run build  
-        working-directory: ./House-Map.newUI
-
-      - name: Deploy
-        uses: burnett01/rsync-deployments@4.1
-        with:
-        # 这里是 rsync 的参数 switches: -avzh --delete --exclude="" --include="" --filter=""
-          switches: -avzh
-          path: ./House-Map.newUI/dist/*
-          remote_path: /opt/www/house2048-new-ui/
-          remote_host: ${{ secrets.HOUSE_MAP_SERVER }}
-          remote_port: 22
-          remote_user: root
-          remote_key: ${{ secrets.LGB_HOME }}
\ No newline at end of file
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
index 268b1b75..9534d17e 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -24,18 +24,18 @@ jobs:
     
       - name: Install dependencies  
         run: npm install  
-        working-directory: ./House-Map.UI
+        working-directory: ./House-Map.newUI
     
       - name: Build  
         run: npm run build  
-        working-directory: ./House-Map.UI
+        working-directory: ./House-Map.newUI
 
       - name: Deploy
         uses: burnett01/rsync-deployments@4.1
         with:
         # 这里是 rsync 的参数 switches: -avzh --delete --exclude="" --include="" --filter=""
           switches: -avzh
-          path: ./House-Map.UI/dist/*
+          path: ./House-Map.newUI/dist/*
           remote_path: /opt/www/house2048/
           remote_host: ${{ secrets.HOUSE_MAP_SERVER }}
           remote_port: 22