From 8eadaabeafea8eb52fa04f6b7177a701d7975ae2 Mon Sep 17 00:00:00 2001
From: Morgan Pretty <morgan.t.pretty@gmail.com>
Date: Wed, 3 Apr 2024 15:58:46 +1100
Subject: [PATCH] More tweaks

---
 .drone.jsonnet | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index 379a8d78a..5c7458019 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -16,14 +16,12 @@ local custom_clone = {
   name: 'Clone',
   environment: { CLONE_KEY: { from_secret: 'CLONE_KEY' } },
   commands: [
-    'mkdir -p ~/.ssh',
-    'echo "$CLONE_KEY" > ~/.ssh/id_git',
-    'chmod 600 ~/.ssh/id_git',
     'eval "$(ssh-agent)"',
-    'ssh-agent ssh-add ~/.ssh/id_git',
+    'echo "$CLONE_KEY" | tr -d "\r" | ssh-add -',
+    'mkdir -p ~/.ssh && touch ~/.ssh/config && touch ~/.ssh/known_hosts && chmod -R 400 ~/.ssh',
     'git init',
-    'git remote add origin git@github.com:$DRONE_REPO.git',
-    'git fetch --depth=1 origin +refs/heads/$DRONE_BRANCH',
+    'git remote add origin $DRONE_GIT_SSH_URL',
+    'git fetch --depth=1 origin +$DRONE_COMMIT_REF',
     'git checkout $DRONE_COMMIT',
     'git fetch --tags',
     'git submodule update --init --recursive --depth=2 --jobs=4'