From cca28e1d1535a720fba763102da3d0ff094c3079 Mon Sep 17 00:00:00 2001
From: surtur <a_mirre@utb.cz>
Date: Tue, 10 Mar 2020 01:54:10 +0100
Subject: [PATCH] .drone.yml pipeline updates

---
 .drone.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 4de1c97..344d516 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,15 +23,6 @@ steps:
 - name: rsync-deploy
   pull: if-not-exists
   image: immawanderer/archlinux-hugo:latest
-  commands:
-    - git submodule init
-    - git submodule update
-    - rm -rfv ./public
-    - hugo --gc=true --minify
-    - echo "$HUGO_KEY" > ./hugo_deploy
-    - chmod -v 600 ./hugo_deploy
-    - rsync -ave "ssh -vv -i ./hugo_deploy -o KexAlgorithms=curve25519-sha256@libssh.org,ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group-exchange-sha256 -o PreferredAuthentications=publickey -o PasswordAuthentication=no -c aes256-ctr,aes256-cbc -o StrictHostKeyChecking=no" --delete public/ $HUGO_USER@$HUGO_HOST:$HUGO_DIR
-    - shred -zuv -n 7 ~/hugo_deploy
   environment:
     HUGO_KEY:
       from_secret: hugo_key
@@ -41,6 +32,15 @@ steps:
       from_secret: hugo_host
     HUGO_DIR:
       from_secret: hugo_dir
+  commands:
+    - git submodule init
+    - git submodule update
+    - rm -rfv ./public
+    - hugo --gc=true --minify
+    - echo $HUGO_KEY > ./hugo_deploy
+    - chmod -v 600 ./hugo_deploy
+    - rsync -av -e 'ssh -vv -i ./hugo_deploy -o KexAlgorithms=curve25519-sha256@libssh.org,ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group-exchange-sha256 -o PreferredAuthentications=publickey -o PubkeyAuthentication=yes -o PasswordAuthentication=no -c aes256-ctr,aes256-cbc -o StrictHostKeyChecking=no' --delete public/ $HUGO_USER@$HUGO_HOST:$HUGO_DIR
+    - shred -zuv -n 7 ./hugo_deploy
   when:
     status:
     - success
@@ -80,7 +80,7 @@ steps:
     pull: always
     image: appleboy/drone-discord:1.2.4
     settings:
-      message: "{{#success build.status}} ✅  Build #{{build.number}} of `{{repo.name}}` succeeded.\n\n📝 Commit by {{commit.author}} on `{{commit.branch}}`:\n``` {{commit.message}} ```\n\n🌐 {{ build.link }} {{else}} ❌  Build #{{build.number}} of `{{repo.name}}` failed.\n\n📝 Commit by {{commit.author}} on `{{commit.branch}}`:\n``` {{commit.message}} ```\n\n🌐 {{ build.link }} {{/success}}\n"
+        message: "{{#success build.status}} ✅  Build #{{build.number}} of `{{repo.name}}` succeeded.\n\ncommit `${DRONE_COMMIT_SHA:0:7}` by {{commit.author}} on `{{commit.branch}}`:\n``` {{commit.message}} ```\n\n{{ build.link }}\n {{else}} ❌  Build #{{build.number}} of `{{repo.name}}` failed.\n\ncommit `${DRONE_COMMIT_SHA:0:7}` by {{commit.author}} on `{{commit.branch}}`:\n``` {{commit.message}} ```\n\n{{ build.link }}\n {{/success}}\n"
       webhook_id:
         from_secret: discord_webhook_id
       webhook_token:
@@ -116,7 +116,7 @@ steps:
     pull: always
     image: appleboy/drone-discord:1.2.4
     settings:
-      message: "{{#success build.status}} ✅  Build #{{build.number}} of `{{repo.name}}` succeeded.\n\n📝 Commit by {{commit.author}} on `{{commit.branch}}`:\n``` {{commit.message}} ```\n\n🌐 {{ build.link }} {{else}} ❌  Build #{{build.number}} of `{{repo.name}}` failed.\n\n📝 Commit by {{commit.author}} on `{{commit.branch}}`:\n``` {{commit.message}} ```\n\n🌐 {{ build.link }} {{/success}}\n"
+        message: "{{#success build.status}} ✅  Build #{{build.number}} of `{{repo.name}}` succeeded.\n\ncommit `${DRONE_COMMIT_SHA:0:7}` by {{commit.author}} on `{{commit.branch}}`:\n``` {{commit.message}} ```\n\n{{ build.link }}\n {{else}} ❌  Build #{{build.number}} of `{{repo.name}}` failed.\n\ncommit `${DRONE_COMMIT_SHA:0:7}` by {{commit.author}} on `{{commit.branch}}`:\n``` {{commit.message}} ```\n\n{{ build.link }}\n {{/success}}\n"
       webhook_id:
         from_secret: discord_webhook_hourly_id
       webhook_token:
@@ -147,7 +147,7 @@ steps:
     pull: always
     image: appleboy/drone-discord:1.2.4
     settings:
-      message: "{{#success build.status}} ✅  Build #{{build.number}} of `{{repo.name}}` has been successfully deployed.\n\n📝 Commit by {{commit.author}} on `{{commit.branch}}`:\n``` {{commit.message}} ```\n\n🌐 {{ build.link }} {{else}} ❌  Build #{{build.number}} of `{{repo.name}}` failed to deploy.\n\n📝 Commit by {{commit.author}} on `{{commit.branch}}`:\n``` {{commit.message}} ```\n🌐 {{ build.link }} {{/success}}\n\n"
+        message: "{{#success build.status}} ✅  Build #{{build.number}} of `{{repo.name}}` has been successfully deployed.\n\ncommit `${DRONE_COMMIT_SHA:0:7}` by {{commit.author}} on `{{commit.branch}}`:\n``` {{commit.message}} ```\n\n{{ build.link }}\n {{else}} ❌  Build #{{build.number}} of `{{repo.name}}` failed to deploy.\n\ncommit `${DRONE_COMMIT_SHA:0:7}` by {{commit.author}} on `{{commit.branch}}`:\n``` {{commit.message}} ```\n{{ build.link }}\n {{/success}}\n\n"
       webhook_id:
         from_secret: discord_webhook_id
       webhook_token: