test gh-pages

.github/workflows/action.yml

@@ -0,0 +1,17 @@
+# On every push this script is executed
+on: push
+name: Build and deploy GH Pages
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/development'
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+      - name: build_and_deploy
+        uses: shalzz/zola-deploy-action@v0.14.1
+        env:
+          # Target branch
+          PAGES_BRANCH: gh-pages
+          # Provide personal access token
+          TOKEN: ${{ secrets.TOKEN }}

.github/workflows/tf_update.yml

@@ -1,43 +1,24 @@
-<<<<<<< HEAD
 name: Ourworld.tf
-on: 
-  push:
-    branch: [ master ]
-=======
-name: freeflow.life
 on: 
   push:
     branch: [ development ]
->>>>>>> template/master
 
 jobs:
   job_one:
     name: Deploy
     runs-on: ubuntu-latest
     steps:
-<<<<<<< HEAD
     - name: pushing latest change on www.ourworld.tf
       uses: appleboy/ssh-action@master
       with:
         host: www.ourworld.tf
-=======
-    - name: pushing latest change on www2.freeflow.life
-      uses: appleboy/ssh-action@master
-      with:
-        host: www2.freeflow.life
->>>>>>> template/master
         username: root
         key: ${{ secrets.TF_SECRET }}
         port: 22
         script: |
-<<<<<<< HEAD
           cd /opt/www_ourworld_tf/
           git log -1
           git pull
           npm run build
-=======
-          cd /opt/www_freeflow_life
-          git log -1
-          git pull
-          bash build.sh
->>>>>>> template/master
+
+