From 847d42b26b0ff19a80f2c7bfe3cdbdc0b454dcd6 Mon Sep 17 00:00:00 2001
From: jo <ljonas@riseup.net>
Date: Thu, 8 Jun 2023 12:49:57 +0200
Subject: [PATCH] ci: fix deploy_docs job after merge from stable

---
 .gitlab-ci.yml                              | 11 ++---------
 changes/changelog.d/ci-fix-deploy-docs.misc |  1 +
 2 files changed, 3 insertions(+), 9 deletions(-)
 create mode 100644 changes/changelog.d/ci-fix-deploy-docs.misc

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e784c0383..a4f6224ed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -424,21 +424,14 @@ deploy_docs:
   needs:
     - job: build_docs
       artifacts: true
-  before_script:
-    - apk add openssh-client rsync
-    - mkdir -p ~/.ssh
-    - echo "$SSH_KNOWN_HOSTS" >> ~/.ssh/known_hosts
-    - chmod 644 ~/.ssh/known_hosts
-    - eval `ssh-agent -s`
-    - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
-  script:
-    - rsync -r -e "ssh -p 2282" $CI_PROJECT_DIR/public/ docs@docs.funkwhale.audio:/htdocs/$CI_COMMIT_REF_NAME
   rules:
     - if: $CI_COMMIT_BRANCH =~ /(stable|develop)/
 
   image: $CI_REGISTRY/funkwhale/ci/python:3.11
   variables:
     GIT_STRATEGY: none
+  script:
+    - rsync -r -e "ssh -p 2282" $CI_PROJECT_DIR/public/ docs@docs.funkwhale.audio:/htdocs/$CI_COMMIT_REF_NAME
 
 .docker:
   interruptible: false
diff --git a/changes/changelog.d/ci-fix-deploy-docs.misc b/changes/changelog.d/ci-fix-deploy-docs.misc
new file mode 100644
index 000000000..dd980f183
--- /dev/null
+++ b/changes/changelog.d/ci-fix-deploy-docs.misc
@@ -0,0 +1 @@
+Fix CI deploy docs job after stable branch merge