From 6fb6a3347f953e60d8b1246339cc21db81965fdb Mon Sep 17 00:00:00 2001
From: robin <binkrassdufass@gmail.com>
Date: Wed, 20 Sep 2023 08:28:14 +0000
Subject: [PATCH] live?

---
 .gitea/workflows/deploy.yaml | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 8c2a65d..0b9fef4 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -14,21 +14,17 @@ jobs:
               with:
                   fetch-depth: 0
 
-            - name: remove lfs links
-              run: |
-                  ls -la .yarn/cache
-                  rm -r .yarn/cache
-
             - name: setup node 18
               uses: actions/setup-node@v3
-              with:
-                  node-version: 18
-                  cache: yarn
+              # with:
+              #    node-version: 18
+              #     cache: yarn
 
             - name: install dependencies
               env:
                   FORCE_COLOR: "true"
               run: |
+                  npm install -g yarn
                   yarn install
 
             - name: modify config
@@ -51,8 +47,8 @@ jobs:
                   sed -i s/__TIMESTAMP__/$stamp/g frontend/spa.html
                   # sed -i s/__TIMESTAMP__/$stamp/g frontend/serviceworker.js
                   # cat frontend/serviceworker.js
-                  rm api/templates/spa.html
-                  cp frontend/spa.html api/templates/spa.html
+                  # rm api/templates/spa.html
+                  # cp frontend/spa.html api/templates/spa.html
                   echo ______ frontend/spa.html ______
                   cat frontend/spa.html
 
@@ -74,7 +70,7 @@ jobs:
               run: |
                   yarn build:legacy
 
-            #- name: staging api
+            #- name: staging api test
             #  if: github.ref == 'refs/heads/dev'
             #  run: |
             #      targetDir=/data/${GITHUB_REPOSITORY}/${GITHUB_REF_NAME}
@@ -83,7 +79,7 @@ jobs:
             #      mkdir -p $targetDir/frontend/dist
             #      rsync -av frontend/dist/ $targetDir/frontend/dist/
 
-            #- name: staging frontend
+            #- name: staging frontend te
             #  if: github.ref == 'refs/heads/dev'
             #  run: |
             #      docker compose -p ${GITHUB_REF_NAME}-${GITHUB_REPOSITORY_NAME}-${GITHUB_REPOSITORY_OWNER} up -d --build --remove-orphans
@@ -91,7 +87,7 @@ jobs:
             - name: deploy
               if: github.ref == 'refs/heads/master'
               env:
-                  RSYNC_USER: "allkids_rsync_master"
+                  RSYNC_USER: "Grit Grenzdörfer_rsync_master"
                   RSYNC_PASS: ${{ secrets.rsync_master }}
               run: |
                   scripts/deploy.sh ftp1.webmakers.de $RSYNC_USER $RSYNC_PASS