From eedb1045cb69cd9e22baf7094a2e39193e672f42 Mon Sep 17 00:00:00 2001 From: milzi234 Date: Tue, 3 Dec 2024 17:23:14 +0100 Subject: [PATCH 1/2] put pdfs in latex subdirectory before uploading to web1 --- .github/workflows/documentation.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 470842faf699..2c600f8420f0 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -249,7 +249,8 @@ 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/ - cp artifacts/PowerDNS-Authoritative-${{needs.build-docs.outputs.pdns_version}}.pdf/PowerDNS-Authoritative.pdf ./docs/_build/auth-html-docs/ + mkdir -p ./docs/_build/latex + cp artifacts/PowerDNS-Authoritative-${{needs.build-docs.outputs.pdns_version}}.pdf/PowerDNS-Authoritative.pdf ./docs/_build/latex/ 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}} @@ -258,7 +259,8 @@ 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/ - cp artifacts/PowerDNS-Recursor-${{needs.build-docs.outputs.pdns_version}}.pdf/PowerDNS-Recursor.pdf ./pdns/recursordist/docs/_build/rec-html-docs/ + 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/ 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}} @@ -267,7 +269,8 @@ 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/ - cp artifacts/dnsdist-${{needs.build-docs.outputs.pdns_version}}.pdf/dnsdist.pdf ./pdns/dnsdistdist/docs/_build/dnsdist-html-docs/ + mkdir -p ./pdns/dnsdistdist/docs/_build/latex + cp artifacts/dnsdist-${{needs.build-docs.outputs.pdns_version}}.pdf/dnsdist.pdf ./pdns/dnsdistdist/docs/_build/latex/ inv ci-docs-upload-master --docs-host="${DOCS_HOST}" --pdf="dnsdist.pdf" --username="dnsdist_org" --product="dnsdist" env: DOCS_HOST: ${{vars.DOCS_HOST}} From abc907ecd689f6f8414e2a163ba08d163f1734e1 Mon Sep 17 00:00:00 2001 From: milzi234 Date: Tue, 3 Dec 2024 17:46:11 +0100 Subject: [PATCH 2/2] or remove the extra upload step :) --- .github/workflows/documentation.yml | 9 +++------ tasks.py | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 2c600f8420f0..470842faf699 100644 --- 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 849db035cdc2..8b18af835d5d 100644 --- 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):