Merge branch 'develop' of github.com:AlbertSmit/AlbertSm.it into develop

AlbertSmit · Mar 10, 2022 · edf9bb3 · edf9bb3
2 parents 9ec1ddf + 5b346c8
commit edf9bb3
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -1,9 +1,8 @@
 name: Deploy
 
-# on:
-#   push:
-#     branches:
-#       master
+on:
+  push:
+    branches: master
 
 jobs:
   build:
@@ -24,8 +23,8 @@ jobs:
 
       - name: Build
         run: |
-          npm ci
-          npm run build
+          yarn install --frozen-lockfile 
+          yarn build
 
       #     - name: Upload Artifact
       #       uses: actions/upload-artifact@v2
@@ -34,12 +33,14 @@ jobs:
 
       - name: List Build
         run: |
-          ls build
+          ls dist
 
       - name: FTP Deploy
         uses: SamKirkland/FTP-Deploy-Action@4.0.0
         with:
-          ftp-server: ${{ secrets.FTP }}
-          ftp-username: ${{ secrets.FTP_USER }}
-          ftp-password: ${{ secrets.FTP_PW }}
-          local-dir: build
+          port: 21
+          server: ${{ secrets.FTP }}
+          username: ${{ secrets.FTP_USER }}
+          password: ${{ secrets.FTP_PW }}
+          local-dir: dist/
+          server-dir: albertsm.it/wwwroot/