Actions/CI: Add product name in documentation zip files

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index cf497eb0c7c8b94535d6a6f9c2e6b1fced89608a..2f4400c936e81906d5f7f426805779468494008f 100644 (file)
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -33,15 +33,15 @@ jobs:
 
       # Auth
       - run: inv ci-docs-build
-      - run: mv html html-docs
+      - run: mv html auth-html-docs
         working-directory: ./docs/_build
-      - run: tar cf html-docs.tar html-docs
+      - run: tar cf auth-html-docs.tar auth-html-docs
         working-directory: ./docs/_build
       - uses: actions/upload-artifact@v3
         with:
           name: authoritative-html-docs
-          path: ./docs/_build/html-docs.tar
-      - run: bzip2 html-docs.tar
+          path: ./docs/_build/auth-html-docs.tar
+      - run: bzip2 auth-html-docs.tar
         if: ${{github.ref_name == 'master'}}
         working-directory: ./docs/_build
       - run: inv ci-docs-build-pdf
@@ -51,7 +51,7 @@ jobs:
           name: PowerDNS-Authoritative.pdf
           path: ./docs/_build/latex/PowerDNS-Authoritative.pdf
         if: ${{github.ref_name == 'master'}}
-      - run: inv ci-docs-upload-master --docs-host="${DOCS_HOST}" --pdf="PowerDNS-Authoritative.pdf" --username="docs_powerdns_com" --directory="/${AUTH_DOCS_DIR}/"
+      - run: 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}}
           AUTH_DOCS_DIR: ${{vars.AUTH_DOCS_DIR}}
@@ -60,15 +60,15 @@ jobs:
       # Rec
       - run: inv ci-docs-build
         working-directory: ./pdns/recursordist
-      - run: mv html html-docs
+      - run: mv html rec-html-docs
         working-directory: ./pdns/recursordist/docs/_build
-      - run: tar cf html-docs.tar html-docs
+      - run: tar cf rec-html-docs.tar rec-html-docs
         working-directory: ./pdns/recursordist/docs/_build
       - uses: actions/upload-artifact@v3
         with:
           name: recursor-html-docs
-          path: ./pdns/recursordist/docs/_build/html-docs.tar
-      - run: bzip2 html-docs.tar
+          path: ./pdns/recursordist/docs/_build/rec-html-docs.tar
+      - run: bzip2 rec-html-docs.tar
         if: ${{github.ref_name == 'master'}}
         working-directory: ./pdns/recursordist/docs/_build
       - run: inv ci-docs-build-pdf
@@ -79,7 +79,7 @@ jobs:
           name: PowerDNS-Recursor.pdf
           path: ./pdns/recursordist/docs/_build/latex/PowerDNS-Recursor.pdf
         if: ${{github.ref_name == 'master'}}
-      - run: inv ci-docs-upload-master --docs-host="${DOCS_HOST}" --pdf="PowerDNS-Recursor.pdf" --username="docs_powerdns_com" --directory="/${REC_DOCS_DIR}/"
+      - run: 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}}
           REC_DOCS_DIR: ${{vars.REC_DOCS_DIR}}
@@ -89,15 +89,15 @@ jobs:
       # DNSdist
       - run: inv ci-docs-build
         working-directory: ./pdns/dnsdistdist
-      - run: mv html html-docs
+      - run: mv html dnsdist-html-docs
         working-directory: ./pdns/dnsdistdist/docs/_build
-      - run: tar cf html-docs.tar html-docs
+      - run: tar cf dnsdist-html-docs.tar dnsdist-html-docs
         working-directory: ./pdns/dnsdistdist/docs/_build
       - uses: actions/upload-artifact@v3
         with:
           name: dnsdist-html-docs
-          path: ./pdns/dnsdistdist/docs/_build/html-docs.tar
-      - run: bzip2 html-docs.tar
+          path: ./pdns/dnsdistdist/docs/_build/dnsdist-html-docs.tar
+      - run: bzip2 dnsdist-html-docs.tar
         if: ${{github.ref_name == 'master'}}
         working-directory: ./pdns/dnsdistdist/docs/_build
       - run: inv ci-docs-build-pdf
@@ -108,7 +108,7 @@ jobs:
           name: dnsdist.pdf
           path: ./pdns/dnsdistdist/docs/_build/latex/dnsdist.pdf
         if: ${{github.ref_name == 'master'}}
-      - run: inv ci-docs-upload-master --docs-host="${DOCS_HOST}" --pdf="dnsdist.pdf" --username="dnsdist_org"
+      - run: inv ci-docs-upload-master --docs-host="${DOCS_HOST}" --pdf="dnsdist.pdf" --username="dnsdist_org" --product="dnsdist"
         env:
           DOCS_HOST: ${{vars.DOCS_HOST}}
         if: ${{github.ref_name == 'master' && steps.setup-ssh.outputs.have_ssh_key != ''}}

diff --git a/tasks.py b/tasks.py
index 3abecdcf255722a8c23a2611918df7033fb3d6c1..05c4337fa1c076baee143b4d390fc389ec42c64d 100644 (file)
--- a/tasks.py
+++ b/tasks.py
@@ -295,9 +295,9 @@ def ci_docs_build_pdf(c):
     c.run('make -f Makefile.sphinx -C docs latexpdf')
 
 @task
-def ci_docs_upload_master(c, docs_host, pdf, username, directory=""):
+def ci_docs_upload_master(c, docs_host, pdf, username, product, directory=""):
     c.run(f"rsync -crv --delete --no-p --chmod=g=rwX --exclude '*~' ./docs/_build/html-docs/ {username}@{docs_host}:{directory}")
-    c.run(f"rsync -crv --no-p --chmod=g=rwX --exclude '*~' ./docs/_build/html-docs.tar.bz2 {username}@{docs_host}:{directory}")
+    c.run(f"rsync -crv --no-p --chmod=g=rwX --exclude '*~' ./docs/_build/{product}-html-docs.tar.bz2 {username}@{docs_host}:{directory}")
     c.run(f"rsync -crv --no-p --chmod=g=rwX --exclude '*~' ./docs/_build/latex/{pdf} {username}@{docs_host}:{directory}")
 
 @task