or remove the extra upload step :)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 2c600f8420f04a4d34d2898c780053c1198d0cf7..470842faf6994a69ed1cbafdbba911be6ca35ba3 100644 (file)
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -249,8 +249,7 @@ jobs:
         run: |
           mkdir -p ./docs/_build
           tar -xf artifacts/authoritative-html-docs-${{needs.build-docs.outputs.pdns_version}}/auth-html-docs.tar -C ./docs/_build/
-          mkdir -p ./docs/_build/latex
-          cp artifacts/PowerDNS-Authoritative-${{needs.build-docs.outputs.pdns_version}}.pdf/PowerDNS-Authoritative.pdf ./docs/_build/latex/
+          cp artifacts/PowerDNS-Authoritative-${{needs.build-docs.outputs.pdns_version}}.pdf/PowerDNS-Authoritative.pdf ./docs/_build/auth-html-docs/
           inv ci-docs-upload-master --docs-host="${DOCS_HOST}" --pdf="PowerDNS-Authoritative.pdf" --username="docs_powerdns_com" --product="auth" --directory="/${AUTH_DOCS_DIR}/"
         env:
           DOCS_HOST: ${{vars.DOCS_HOST}}
@@ -259,8 +258,7 @@ jobs:
         run: |
           mkdir -p ./pdns/recursordist/docs/_build
           tar -xf artifacts/recursor-html-docs-${{needs.build-docs.outputs.pdns_version}}/rec-html-docs.tar -C ./pdns/recursordist/docs/_build/
-          mkdir -p ./pdns/recursordist/docs/_build/latex
-          cp artifacts/PowerDNS-Recursor-${{needs.build-docs.outputs.pdns_version}}.pdf/PowerDNS-Recursor.pdf ./pdns/recursordist/docs/_build/latex/
+          cp artifacts/PowerDNS-Recursor-${{needs.build-docs.outputs.pdns_version}}.pdf/PowerDNS-Recursor.pdf ./pdns/recursordist/docs/_build/rec-html-docs/
           inv ci-docs-upload-master --docs-host="${DOCS_HOST}" --pdf="PowerDNS-Recursor.pdf" --username="docs_powerdns_com" --product="rec" --directory="/${REC_DOCS_DIR}/"
         env:
           DOCS_HOST: ${{vars.DOCS_HOST}}
@@ -269,8 +267,7 @@ jobs:
         run: |
           mkdir -p ./pdns/dnsdistdist/docs/_build
           tar -xf artifacts/dnsdist-html-docs-${{needs.build-docs.outputs.pdns_version}}/dnsdist-html-docs.tar -C ./pdns/dnsdistdist/docs/_build/
-          mkdir -p ./pdns/dnsdistdist/docs/_build/latex
-          cp artifacts/dnsdist-${{needs.build-docs.outputs.pdns_version}}.pdf/dnsdist.pdf ./pdns/dnsdistdist/docs/_build/latex/
+          cp artifacts/dnsdist-${{needs.build-docs.outputs.pdns_version}}.pdf/dnsdist.pdf ./pdns/dnsdistdist/docs/_build/dnsdist-html-docs/
           inv ci-docs-upload-master --docs-host="${DOCS_HOST}" --pdf="dnsdist.pdf" --username="dnsdist_org" --product="dnsdist"
         env:
           DOCS_HOST: ${{vars.DOCS_HOST}}

diff --git a/tasks.py b/tasks.py
index 849db035cdc2cf2758f99d787199f6fe2780c121..8b18af835d5d9ddd936b98cc7f1633ffe493be9d 100644 (file)
--- a/tasks.py
+++ b/tasks.py
@@ -379,7 +379,6 @@ def ci_docs_upload_master(c, docs_host, pdf, username, product, directory=""):
         "--exclude '*~'",
     ])
     c.run(f"{rsync_cmd} --delete ./docs/_build/{product}-html-docs/ {username}@{docs_host}:{directory}")
-    c.run(f"{rsync_cmd} ./docs/_build/latex/{pdf} {username}@{docs_host}:{directory}")
 
 @task
 def ci_docs_add_ssh(c, ssh_key, host_key):