From 6cb27fbadb4e564a6986c7e67c2b91aabe67937a Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Thu, 2 Oct 2025 12:28:05 +0000 Subject: [PATCH] gh-actions --- .../templates/build-html-docs.yaml.j2 | 20 ++++++++++++++-- otc_metadata/templates/build-pdf-docs.yaml.j2 | 20 ++++++++++++++-- tools/generate_doc_confpy.py | 24 ++++++++++++++----- 3 files changed, 54 insertions(+), 10 deletions(-) diff --git a/otc_metadata/templates/build-html-docs.yaml.j2 b/otc_metadata/templates/build-html-docs.yaml.j2 index ebd6bbc..7caf80b 100644 --- a/otc_metadata/templates/build-html-docs.yaml.j2 +++ b/otc_metadata/templates/build-html-docs.yaml.j2 @@ -15,8 +15,9 @@ jobs: with: docs_path: "doc/build/html" docs_service: {{ service_uri }} - swift_container: "gitea_action_logs" + {%- if environment == 'internal' %} {% raw -%} + swift_container: "gitea_action_logs" otc_swift_username: ${{ secrets.OTC_SWIFT_USERNAME }} otc_swift_password: ${{ secrets.OTC_SWIFT_PASSWORD }} otc_swift_project_name: ${{ secrets.OTC_SWIFT_PROJECT_NAME }} @@ -27,4 +28,19 @@ jobs: repo: ${{ gitea.repository }} pr_number: ${{ gitea.event.pull_request.number }} run_id: ${{ gitea.run_id }} - {%- endraw %} \ No newline at end of file + {%- endraw %} + {%- elif environment == 'public' %} + {% raw -%} + swift_container: "github_action_logs" + otc_swift_username: ${{ secrets.OTC_SWIFT_USERNAME }} + otc_swift_password: ${{ secrets.OTC_SWIFT_PASSWORD }} + otc_swift_project_name: ${{ secrets.OTC_SWIFT_PROJECT_NAME }} + otc_swift_domain: ${{ secrets.OTC_SWIFT_DOMAIN }} + otc_swift_endpoint: ${{ secrets.OTC_SWIFT_ENDPOINT }} + gitea_token: ${{ secrets.GITHUB_TOKEN }} + gitea_server_url: ${{ github.server_url }} + repo: ${{ github.repository }} + pr_number: ${{ github.event.pull_request.number }} + run_id: ${{ github.run_id }} + {%- endraw %} + {%- endif %} \ No newline at end of file diff --git a/otc_metadata/templates/build-pdf-docs.yaml.j2 b/otc_metadata/templates/build-pdf-docs.yaml.j2 index 472c8ef..be56752 100644 --- a/otc_metadata/templates/build-pdf-docs.yaml.j2 +++ b/otc_metadata/templates/build-pdf-docs.yaml.j2 @@ -15,8 +15,9 @@ jobs: with: docs_path: "doc/build/pdf" docs_service: {{ service_uri }} - swift_container: "gitea_action_logs" + {%- if environment == 'internal' %} {% raw -%} + swift_container: "gitea_action_logs" otc_swift_username: ${{ secrets.OTC_SWIFT_USERNAME }} otc_swift_password: ${{ secrets.OTC_SWIFT_PASSWORD }} otc_swift_project_name: ${{ secrets.OTC_SWIFT_PROJECT_NAME }} @@ -27,4 +28,19 @@ jobs: repo: ${{ gitea.repository }} pr_number: ${{ gitea.event.pull_request.number }} run_id: ${{ gitea.run_id }} - {%- endraw %} \ No newline at end of file + {%- endraw %} + {%- elif environment == 'public' %} + {% raw -%} + swift_container: "github_action_logs" + otc_swift_username: ${{ secrets.OTC_SWIFT_USERNAME }} + otc_swift_password: ${{ secrets.OTC_SWIFT_PASSWORD }} + otc_swift_project_name: ${{ secrets.OTC_SWIFT_PROJECT_NAME }} + otc_swift_domain: ${{ secrets.OTC_SWIFT_DOMAIN }} + otc_swift_endpoint: ${{ secrets.OTC_SWIFT_ENDPOINT }} + gitea_token: ${{ secrets.GITHUB_TOKEN }} + gitea_server_url: ${{ github.server_url }} + repo: ${{ github.repository }} + pr_number: ${{ github.event.pull_request.number }} + run_id: ${{ github.run_id }} + {%- endraw %} + {%- endif %} \ No newline at end of file diff --git a/tools/generate_doc_confpy.py b/tools/generate_doc_confpy.py index 4691d9c..5f51c3b 100644 --- a/tools/generate_doc_confpy.py +++ b/tools/generate_doc_confpy.py @@ -371,21 +371,33 @@ def process_repositories(args, service): """Update actions""" context = dict(docs=[]) context["service_uri"] = service['service_uri'] + context["environment"] = args.target_environment actions_yaml_content_html = actions_yaml_template_html.render(**context) actions_yaml_content_pdf = actions_yaml_template_pdf.render(**context) - actions_yaml_content_html_path = pathlib.Path(copy_to, ".gitea", "workflows", "build-html-docs.yaml") - actions_yaml_content_html_path.parent.mkdir(parents=True, exist_ok=True) - actions_yaml_content_pdf_path = pathlib.Path(copy_to, ".gitea", "workflows", "build-pdf-docs.yaml") - actions_yaml_content_pdf_path.parent.mkdir(parents=True, exist_ok=True) + if args.target_environment == "internal": + actions_yaml_content_html_path = pathlib.Path(copy_to, ".gitea", "workflows", "build-html-docs.yaml") + actions_yaml_content_html_path.parent.mkdir(parents=True, exist_ok=True) + actions_yaml_content_pdf_path = pathlib.Path(copy_to, ".gitea", "workflows", "build-pdf-docs.yaml") + actions_yaml_content_pdf_path.parent.mkdir(parents=True, exist_ok=True) + elif args.target_environment == "public": + actions_yaml_content_html_path = pathlib.Path(copy_to, ".github", "workflows", "build-html-docs.yaml") + actions_yaml_content_html_path.parent.mkdir(parents=True, exist_ok=True) + actions_yaml_content_pdf_path = pathlib.Path(copy_to, ".github", "workflows", "build-pdf-docs.yaml") + actions_yaml_content_pdf_path.parent.mkdir(parents=True, exist_ok=True) + with open(actions_yaml_content_html_path, "w", encoding="utf-8", newline="") as out: logging.debug(f"Generating {actions_yaml_content_html_path} from template...") out.write(actions_yaml_content_html) - repo_to.index.add([".gitea/workflows/build-html-docs.yaml"]) with open(actions_yaml_content_pdf_path, "w", encoding="utf-8", newline="") as out: logging.debug(f"Generating {actions_yaml_content_pdf_path} from template...") out.write(actions_yaml_content_pdf) - repo_to.index.add([".gitea/workflows/build-pdf-docs.yaml"]) + if args.target_environment == "internal": + repo_to.index.add([".gitea/workflows/build-html-docs.yaml"]) + repo_to.index.add([".gitea/workflows/build-pdf-docs.yaml"]) + elif args.target_environment == "public": + repo_to.index.add([".github/workflows/build-html-docs.yaml"]) + repo_to.index.add([".github/workflows/build-pdf-docs.yaml"]) if len(repo_to.index.diff("HEAD")) == 0: # Nothing to commit