From 4739355fbfe424d77b08cd398ad4633bf2103e66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?=
 <igorpecovnik@users.noreply.github.com>
Date: Sat, 25 Dec 2021 09:23:49 +0100
Subject: [PATCH] Update build-u-boot-with-docker.yml

---
 .../workflows/build-u-boot-with-docker.yml    | 38 +++++++------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build-u-boot-with-docker.yml b/.github/workflows/build-u-boot-with-docker.yml
index aece4c16..446f4b0c 100644
--- a/.github/workflows/build-u-boot-with-docker.yml
+++ b/.github/workflows/build-u-boot-with-docker.yml
@@ -134,17 +134,13 @@ jobs:
           [[ -d build/.git ]] && sudo chown -R $USER:$USER build/.git || true
           [[ -d build/output/images ]] && sudo rm -rf build/output/images/* || true
          
-      - name: Mount upload folders
-        run: |
+      - name: Unmount folders in case they were mount before
         
-          # mount deploy target
-          sudo apt-get -y -qq install sshfs
-          #sudo mkdir -p /root/.ssh/
-          #sudo cp ~/.ssh/known_hosts /root/.ssh/
-          #sudo mkdir -p build/output/debs || true
-          #sudo mkdir -p build/output/debs-beta || true          
-          sshfs upload@users.armbian.com:/debs build/output/debs -o IdentityFile=~/.ssh/id_rsa -o reconnect,nonempty
-          sshfs upload@users.armbian.com:/debs-beta build/output/debs-beta -o IdentityFile=~/.ssh/id_rsa -o reconnect,nonempty
+        run: |
+         
+            sudo mountpoint -q build/output/debs && sudo fusermount -u build/output/debs || true
+            sudo mountpoint -q build/output/debs-beta && sudo fusermount -u build/output/debs-beta || true
+            sudo mountpoint -q build/cache/toolchain && sudo fusermount -u build/cache/toolchain || true
 
       - name: Build
         run: |
@@ -196,19 +192,11 @@ jobs:
           path: build/output/debs-beta/*u-boot*
           if-no-files-found: ignore
 
-#      - name: Deploy to server
-#        if: ${{ success() }}
-#        run: |
-#
-#          while fuser /var/{lib/{dpkg,apt/lists},cache/apt/archives}/lock >/dev/null 2>&1; do sleep 1; done;
-#          sudo apt-get -y -qq install lftp
-#          sudo chown -R $USER:$USER build/output/debs-beta/
-#          lftp -u upload, -e "set net:timeout 10;set net:max-retries 16;mirror --Remove-source-files -R --no-empty-dirs --parallel=8 --no-perms $(pwd)/build/output/debs-beta/ debs-beta/ ;bye" sftp://users.armbian.com
-
-      - name: Unmount folders
-        
+      - name: Deploy to server
+        if: ${{ success() }}
         run: |
-         
-            sudo mountpoint -q build/output/debs && sudo fusermount -u build/output/debs || true
-            sudo mountpoint -q build/output/debs-beta && sudo fusermount -u build/output/debs-beta || true
-            sudo mountpoint -q build/cache/toolchain && sudo fusermount -u build/cache/toolchain || true
+
+          while fuser /var/{lib/{dpkg,apt/lists},cache/apt/archives}/lock >/dev/null 2>&1; do sleep 1; done;
+          sudo apt-get -y -qq install lftp
+          sudo chown -R $USER:$USER build/output/debs-beta/
+          lftp -u upload, -e "set net:timeout 10;set net:max-retries 16;mirror --Remove-source-files -R --no-empty-dirs --parallel=8 --no-perms $(pwd)/build/output/debs-beta/ debs-beta/ ;bye" sftp://users.armbian.com