From 01162bfc5ec0872269c2e849998e71092fbe36ac Mon Sep 17 00:00:00 2001 From: zemion Date: Wed, 30 Sep 2026 14:56:55 +0200 Subject: [PATCH] Align website tooling with govoplan-website rename --- .gitea/workflows/dependency-audit.yml | 2 +- .gitea/workflows/module-matrix.yml | 2 +- .gitea/workflows/release-integration.yml | 2 +- .gitea/workflows/runtime-distribution.yml | 2 +- .gitea/workflows/security-audit.yml | 2 +- README.md | 2 +- docker/README.md | 2 +- docs/operations/RELEASE_CONSOLE.md | 4 +-- docs/project/REPOSITORY_INDEX.md | 2 +- docs/project/REPOSITORY_STRUCTURE.md | 10 +++---- repositories.json | 2 +- tests/test_devkit_release.py | 4 +-- tests/test_full_registry_catalog.py | 2 +- tests/test_release_run_state.py | 6 ++--- tests/test_repository_bootstrap.py | 4 +-- tools/gitea/gitea-backlog-import.py | 4 +-- tools/gitea/gitea-import-all-backlogs.py | 2 +- tools/gitea/gitea-install-workflow.py | 2 +- tools/gitea/gitea-todo-import.py | 2 +- .../govoplan_release/release_execution.py | 10 +++---- tools/release/govoplan_release/workspace.py | 2 +- tools/release/publish-release-catalog.sh | 26 +++++++++---------- tools/release/push-release-tag.sh | 12 ++++----- tools/release/release-doctor.py | 2 +- 24 files changed, 55 insertions(+), 55 deletions(-) diff --git a/.gitea/workflows/dependency-audit.yml b/.gitea/workflows/dependency-audit.yml index 8faa407..f2b0206 100644 --- a/.gitea/workflows/dependency-audit.yml +++ b/.gitea/workflows/dependency-audit.yml @@ -29,7 +29,7 @@ jobs: git config --global --add url."https://git.add-ideas.de/GovOPlaN/govoplan".insteadOf "ssh://git@git.add-ideas.de/GovOPlaN/govoplan" - name: Bootstrap GovOPlaN repositories working-directory: govoplan - run: python tools/repo/bootstrap-repositories.py --parent .. --transport public-https --reuse-checkout-auth --exclude-repo addideas-govoplan-website + run: python tools/repo/bootstrap-repositories.py --parent .. --transport public-https --reuse-checkout-auth --exclude-repo govoplan-website - name: Install backend dev audit dependencies working-directory: govoplan run: | diff --git a/.gitea/workflows/module-matrix.yml b/.gitea/workflows/module-matrix.yml index 1c3694d..cef43eb 100644 --- a/.gitea/workflows/module-matrix.yml +++ b/.gitea/workflows/module-matrix.yml @@ -44,7 +44,7 @@ jobs: git config --global --add url."https://git.add-ideas.de/GovOPlaN/govoplan".insteadOf "ssh://git@git.add-ideas.de/GovOPlaN/govoplan" - name: Bootstrap GovOPlaN repositories working-directory: govoplan - run: python tools/repo/bootstrap-repositories.py --parent .. --transport public-https --reuse-checkout-auth --exclude-repo addideas-govoplan-website + run: python tools/repo/bootstrap-repositories.py --parent .. --transport public-https --reuse-checkout-auth --exclude-repo govoplan-website - name: Install backend release dependencies working-directory: govoplan run: | diff --git a/.gitea/workflows/release-integration.yml b/.gitea/workflows/release-integration.yml index 05affe5..4a6856e 100644 --- a/.gitea/workflows/release-integration.yml +++ b/.gitea/workflows/release-integration.yml @@ -24,7 +24,7 @@ jobs: git config --global --add url."https://git.add-ideas.de/GovOPlaN/govoplan".insteadOf "ssh://git@git.add-ideas.de/GovOPlaN/govoplan" - name: Bootstrap GovOPlaN repositories working-directory: govoplan - run: python tools/repo/bootstrap-repositories.py --parent .. --transport public-https --reuse-checkout-auth --exclude-repo addideas-govoplan-website + run: python tools/repo/bootstrap-repositories.py --parent .. --transport public-https --reuse-checkout-auth --exclude-repo govoplan-website - name: Validate package publication contracts working-directory: govoplan run: | diff --git a/.gitea/workflows/runtime-distribution.yml b/.gitea/workflows/runtime-distribution.yml index 7259de1..2f04fc5 100644 --- a/.gitea/workflows/runtime-distribution.yml +++ b/.gitea/workflows/runtime-distribution.yml @@ -109,7 +109,7 @@ jobs: git config --global --add url."https://git.add-ideas.de/GovOPlaN/govoplan".insteadOf "ssh://git@git.add-ideas.de/GovOPlaN/govoplan" - name: Bootstrap release sources working-directory: govoplan - run: python tools/repo/bootstrap-repositories.py --parent .. --transport public-https --reuse-checkout-auth --exclude-repo addideas-govoplan-website + run: python tools/repo/bootstrap-repositories.py --parent .. --transport public-https --reuse-checkout-auth --exclude-repo govoplan-website - name: Build release wheel roots and WebUI working-directory: govoplan env: diff --git a/.gitea/workflows/security-audit.yml b/.gitea/workflows/security-audit.yml index 0c01f25..f10a885 100644 --- a/.gitea/workflows/security-audit.yml +++ b/.gitea/workflows/security-audit.yml @@ -32,7 +32,7 @@ jobs: python-version: "3.12" - name: Bootstrap GovOPlaN repositories working-directory: govoplan - run: python tools/repo/bootstrap-repositories.py --parent .. --transport public-https --reuse-checkout-auth --exclude-repo addideas-govoplan-website + run: python tools/repo/bootstrap-repositories.py --parent .. --transport public-https --reuse-checkout-auth --exclude-repo govoplan-website - name: Run whole-system security audit working-directory: govoplan run: tools/checks/security-audit/run.sh --mode "$SECURITY_AUDIT_MODE" --scope "$SECURITY_AUDIT_SCOPE" --reports-dir audit-reports diff --git a/README.md b/README.md index 200096d..1c5cba7 100644 --- a/README.md +++ b/README.md @@ -235,5 +235,5 @@ The target shape is: What doesn't belong here: -- `addideas-govoplan-website/docker-compose.yml`: public website serving +- `govoplan-website/docker-compose.yml`: public website serving profile; this one stays with the website repository. diff --git a/docker/README.md b/docker/README.md index 3d42b9f..3e71ee2 100644 --- a/docker/README.md +++ b/docker/README.md @@ -19,4 +19,4 @@ Module-specific Docker test beds remain in their owning repositories: Website-specific serving profiles remain with the public website repository: -- `addideas-govoplan-website/docker-compose.yml` +- `govoplan-website/docker-compose.yml` diff --git a/docs/operations/RELEASE_CONSOLE.md b/docs/operations/RELEASE_CONSOLE.md index 2fed509..6353597 100644 --- a/docs/operations/RELEASE_CONSOLE.md +++ b/docs/operations/RELEASE_CONSOLE.md @@ -519,8 +519,8 @@ Regenerate the browsable module directory from an existing catalog/keyring: ```sh ./.venv/bin/python tools/release/release-catalog.py module-directory \ - --catalog ../addideas-govoplan-website/public/catalogs/v1/channels/stable.json \ - --keyring ../addideas-govoplan-website/public/catalogs/v1/keyring.json \ + --catalog ../govoplan-website/public/catalogs/v1/channels/stable.json \ + --keyring ../govoplan-website/public/catalogs/v1/keyring.json \ --output-dir runtime/module-directory-preview \ --channel stable ``` diff --git a/docs/project/REPOSITORY_INDEX.md b/docs/project/REPOSITORY_INDEX.md index 8555708..6fc71ff 100644 --- a/docs/project/REPOSITORY_INDEX.md +++ b/docs/project/REPOSITORY_INDEX.md @@ -98,4 +98,4 @@ Generated from `repositories.json`. Use that JSON file as the machine-readable s | Repository | Subtype | Local path | Gitea | | --- | --- | --- | --- | -| `addideas-govoplan-website` | `public-site` | `../addideas-govoplan-website` | [addideas-govoplan-website](https://git.add-ideas.de/add-ideas/addideas-govoplan-website) | +| `govoplan-website` | `public-site` | `../govoplan-website` | [govoplan-website](https://git.add-ideas.de/add-ideas/govoplan-website) | diff --git a/docs/project/REPOSITORY_STRUCTURE.md b/docs/project/REPOSITORY_STRUCTURE.md index 9511f40..da630de 100644 --- a/docs/project/REPOSITORY_STRUCTURE.md +++ b/docs/project/REPOSITORY_STRUCTURE.md @@ -49,7 +49,7 @@ installed into a GovOPlaN runtime. Current website repository: -- `addideas-govoplan-website`: public website and release catalog publication target. +- `govoplan-website`: public website and release catalog publication target. ## Meta Repository Role @@ -93,7 +93,7 @@ Current shared profiles: - `dev/postgres` - `dev/production-like` -Website-specific serving profiles stay with `addideas-govoplan-website`. +Website-specific serving profiles stay with `govoplan-website`. Module-specific test beds stay in the owning module repository. Examples: @@ -104,13 +104,13 @@ Module-specific test beds stay in the owning module repository. Examples: This keeps local module tests close to the code while giving operators one repository for product deployment. -## addideas-govoplan-website and Release Logic +## govoplan-website and Release Logic -`addideas-govoplan-website` should be treated as the public website and catalog publication +`govoplan-website` should be treated as the public website and catalog publication target, not as the release orchestrator. The release workflow should be invoked from `govoplan`. It may write signed -catalog artifacts into `addideas-govoplan-website/public/catalogs/...` and then build or +catalog artifacts into `govoplan-website/public/catalogs/...` and then build or deploy the website. A separate `govoplan-release` repository should only be introduced if release diff --git a/repositories.json b/repositories.json index 4f696a4..b9fb9af 100644 --- a/repositories.json +++ b/repositories.json @@ -76,7 +76,7 @@ {"name": "govoplan-views", "category": "module", "subtype": "platform", "remote": "git@git.add-ideas.de:GovOPlaN/govoplan-views.git", "path": "govoplan-views"}, {"name": "govoplan-voting", "category": "module", "subtype": "domain", "remote": "git@git.add-ideas.de:GovOPlaN/govoplan-voting.git", "path": "govoplan-voting"}, {"name": "govoplan-wiki", "category": "module", "subtype": "domain", "remote": "git@git.add-ideas.de:GovOPlaN/govoplan-wiki.git", "path": "govoplan-wiki"}, - {"name": "addideas-govoplan-website", "category": "website", "subtype": "public-site", "remote": "git@git.add-ideas.de:add-ideas/addideas-govoplan-website.git", "path": "addideas-govoplan-website", "bootstrap_transport": "registered"}, + {"name": "govoplan-website", "category": "website", "subtype": "public-site", "remote": "git@git.add-ideas.de:add-ideas/govoplan-website.git", "path": "govoplan-website", "bootstrap_transport": "registered"}, {"name": "govoplan-workflow", "category": "module", "subtype": "platform", "remote": "git@git.add-ideas.de:GovOPlaN/govoplan-workflow.git", "path": "govoplan-workflow"}, {"name": "govoplan-workflow-engine", "category": "module", "subtype": "platform", "remote": "git@git.add-ideas.de:GovOPlaN/govoplan-workflow-engine.git", "path": "govoplan-workflow-engine"}, {"name": "govoplan-xoev", "category": "connector", "subtype": "standard", "remote": "git@git.add-ideas.de:GovOPlaN/govoplan-xoev.git", "path": "govoplan-xoev"}, diff --git a/tests/test_devkit_release.py b/tests/test_devkit_release.py index 3a99ad5..638281e 100755 --- a/tests/test_devkit_release.py +++ b/tests/test_devkit_release.py @@ -82,7 +82,7 @@ def environment(tmp_path, monkeypatch): if step.get("repo"): step["source_binding"] = receipt(step["repo"]) elif step["id"] == "catalog:validate-sign-publish": - step["source_binding"] = receipt("addideas-govoplan-website", target_tag="") + step["source_binding"] = receipt("govoplan-website", target_tag="") return result monkeypatch.setattr(api, "build_dashboard", dashboard) @@ -432,7 +432,7 @@ def test_catalog_generation_and_publication_use_exact_durable_receipts(environme generator = Mock(side_effect=generated) publisher = Mock(side_effect=published) - website = receipt("addideas-govoplan-website", target_tag="") + website = receipt("govoplan-website", target_tag="") monkeypatch.setattr(api, "generate_catalog_candidate", generator) monkeypatch.setattr(api, "publish_received_candidate", publisher) monkeypatch.setattr(api, "verify_catalog_publication_precondition", Mock(return_value=website)) diff --git a/tests/test_full_registry_catalog.py b/tests/test_full_registry_catalog.py index 0c8858a..8faea9c 100644 --- a/tests/test_full_registry_catalog.py +++ b/tests/test_full_registry_catalog.py @@ -44,7 +44,7 @@ class FullRegistryCatalogTests(unittest.TestCase): self.temp = tempfile.TemporaryDirectory() self.addCleanup(self.temp.cleanup) self.root = Path(self.temp.name) - self.web = self.root / "addideas-govoplan-website" + self.web = self.root / "govoplan-website" self.wheels = self.root / "wheels" self.npm = self.root / "npm" self.wheels.mkdir(mode=0o700) diff --git a/tests/test_release_run_state.py b/tests/test_release_run_state.py index 3a036fc..074fb00 100644 --- a/tests/test_release_run_state.py +++ b/tests/test_release_run_state.py @@ -1411,7 +1411,7 @@ class ReleaseRunApiTests(unittest.TestCase): patch( "server.app.verify_catalog_publication_precondition", return_value=repository_receipt( - repo="addideas-govoplan-website", target_tag="" + repo="govoplan-website", target_tag="" ), ), patch("server.app.default_signing_keys", return_value=("key=/private",)), @@ -1473,7 +1473,7 @@ class ReleaseRunApiTests(unittest.TestCase): workspace_root=Path(temp_dir), remote="origin", expected_website_receipt=repository_receipt( - repo="addideas-govoplan-website", target_tag="" + repo="govoplan-website", target_tag="" ), ) @@ -2199,7 +2199,7 @@ def bind_test_plan_source_states(**kwargs: object) -> dict[str, object]: step["source_binding"] = repository_receipt() elif step.get("id") == "catalog:validate-sign-publish": step["source_binding"] = repository_receipt( - repo="addideas-govoplan-website", target_tag="" + repo="govoplan-website", target_tag="" ) return plan diff --git a/tests/test_repository_bootstrap.py b/tests/test_repository_bootstrap.py index 8773b76..58d83e3 100644 --- a/tests/test_repository_bootstrap.py +++ b/tests/test_repository_bootstrap.py @@ -253,7 +253,7 @@ class RepositoryBootstrapTests(unittest.TestCase): "path": "website", "remote": ( "git@git.add-ideas.de:" - "add-ideas/addideas-govoplan-website.git" + "add-ideas/govoplan-website.git" ), "bootstrap_transport": (bootstrap.REGISTERED_TRANSPORT), } @@ -278,7 +278,7 @@ class RepositoryBootstrapTests(unittest.TestCase): self.assertEqual(0, status) command = runner.call_args.args[0] self.assertEqual( - "git@git.add-ideas.de:add-ideas/addideas-govoplan-website.git", + "git@git.add-ideas.de:add-ideas/govoplan-website.git", command[-2], ) diff --git a/tools/gitea/gitea-backlog-import.py b/tools/gitea/gitea-backlog-import.py index 99d8ca1..89a1e48 100644 --- a/tools/gitea/gitea-backlog-import.py +++ b/tools/gitea/gitea-backlog-import.py @@ -16,7 +16,7 @@ from gitea_common import GiteaClient, GiteaError, infer_target, label_ids_by_nam DEFAULT_PRODUCT_BACKLOG = pathlib.Path("/mnt/DATA/Nextcloud/ADD ideas UG/Products/govoplan/backlog.md") -DEFAULT_WEB_TODO = pathlib.Path("/mnt/DATA/git/addideas-govoplan-website/TODO.md") +DEFAULT_WEB_TODO = pathlib.Path("/mnt/DATA/git/govoplan-website/TODO.md") REPO_ROOTS = { "core": pathlib.Path("/mnt/DATA/git/govoplan-core"), @@ -24,7 +24,7 @@ REPO_ROOTS = { "mail": pathlib.Path("/mnt/DATA/git/govoplan-mail"), "files": pathlib.Path("/mnt/DATA/git/govoplan-files"), "campaign": pathlib.Path("/mnt/DATA/git/govoplan-campaign"), - "web": pathlib.Path("/mnt/DATA/git/addideas-govoplan-website"), + "web": pathlib.Path("/mnt/DATA/git/govoplan-website"), } MODULE_LABELS = { diff --git a/tools/gitea/gitea-import-all-backlogs.py b/tools/gitea/gitea-import-all-backlogs.py index de78325..96916e9 100644 --- a/tools/gitea/gitea-import-all-backlogs.py +++ b/tools/gitea/gitea-import-all-backlogs.py @@ -251,7 +251,7 @@ def is_excluded_repo_file(path: pathlib.Path) -> bool: return True if text.endswith("/docs/GOVOPLAN_MASTER_ROADMAP.md"): return True - if text.endswith("/addideas-govoplan-website/TODO.md"): + if text.endswith(("/govoplan-website/TODO.md", "/addideas-govoplan-website/TODO.md")): return True return False diff --git a/tools/gitea/gitea-install-workflow.py b/tools/gitea/gitea-install-workflow.py index 7df75c9..ba2dbe9 100644 --- a/tools/gitea/gitea-install-workflow.py +++ b/tools/gitea/gitea-install-workflow.py @@ -30,7 +30,7 @@ MODULE_LABEL_BY_REPO = { "govoplan-mail": "module/mail", "govoplan-files": "module/files", "govoplan-campaign": "module/campaign", - "addideas-govoplan-website": "area/marketing", + "govoplan-website": "area/marketing", } diff --git a/tools/gitea/gitea-todo-import.py b/tools/gitea/gitea-todo-import.py index fb90a96..2e2732d 100644 --- a/tools/gitea/gitea-todo-import.py +++ b/tools/gitea/gitea-todo-import.py @@ -325,7 +325,7 @@ def infer_module_label(root: pathlib.Path) -> str: "govoplan-mail": "module/mail", "govoplan-files": "module/files", "govoplan-campaign": "module/campaign", - "addideas-govoplan-website": "area/marketing", + "govoplan-website": "area/marketing", } if root.name in known: return known[root.name] diff --git a/tools/release/govoplan_release/release_execution.py b/tools/release/govoplan_release/release_execution.py index 56852ca..01def66 100644 --- a/tools/release/govoplan_release/release_execution.py +++ b/tools/release/govoplan_release/release_execution.py @@ -167,7 +167,7 @@ def executor_spec(plan_step: dict[str, Any]) -> ExecutorSpec | None: spec if plan_step.get("repo") is None and isinstance(binding, dict) - and binding.get("repo") == "addideas-govoplan-website" + and binding.get("repo") == "govoplan-website" else None ) repo = plan_step.get("repo") @@ -233,7 +233,7 @@ def bind_plan_source_states( bindings[repo] = None try: website_binding = repository_state_receipt( - repo="addideas-govoplan-website", + repo="govoplan-website", target_tag="", workspace_root=workspace_root, include_website=True, @@ -1665,7 +1665,7 @@ def verify_catalog_publication_precondition( *, plan_step: dict[str, Any], workspace_root: Path ) -> dict[str, Any]: current = repository_state_receipt( - repo="addideas-govoplan-website", + repo="govoplan-website", target_tag="", workspace_root=workspace_root, include_website=True, @@ -3052,7 +3052,7 @@ def reconciled_catalog_publication_receipt( web_root = website_root(workspace_root) current = repository_state_receipt( - repo="addideas-govoplan-website", + repo="govoplan-website", target_tag="", workspace_root=workspace_root, include_website=True, @@ -3181,7 +3181,7 @@ def _validated_website_binding(value: object) -> dict[str, Any]: if ( not isinstance(value, dict) or value.get("kind") != "repository_state" - or value.get("repo") != "addideas-govoplan-website" + or value.get("repo") != "govoplan-website" or value.get("remote") != DURABLE_REMOTE or value.get("target_tag") != "" or value.get("tag_object") is not None diff --git a/tools/release/govoplan_release/workspace.py b/tools/release/govoplan_release/workspace.py index 68012e5..72c9756 100644 --- a/tools/release/govoplan_release/workspace.py +++ b/tools/release/govoplan_release/workspace.py @@ -56,4 +56,4 @@ def core_root(workspace_root: Path) -> Path: def website_root(workspace_root: Path) -> Path: - return workspace_root / "addideas-govoplan-website" + return workspace_root / "govoplan-website" diff --git a/tools/release/publish-release-catalog.sh b/tools/release/publish-release-catalog.sh index bc39740..3728519 100644 --- a/tools/release/publish-release-catalog.sh +++ b/tools/release/publish-release-catalog.sh @@ -7,8 +7,8 @@ Usage: tools/release/publish-release-catalog.sh --version --catalog-signing-key [options] Generates a signed module package catalog for a GovOPlaN release, writes it into -addideas-govoplan-website/public/catalogs/v1, validates it, optionally builds the website, -and optionally commits/tags/pushes addideas-govoplan-website. +govoplan-website/public/catalogs/v1, validates it, optionally builds the website, +and optionally commits/tags/pushes govoplan-website. Options: --version Release version without leading v. @@ -19,15 +19,15 @@ Options: --catalog-signing-key Ed25519 private key. May be repeated for rotation. --core-root govoplan-core checkout. Defaults to ../govoplan-core. - --web-root addideas-govoplan-website checkout. Defaults to ../addideas-govoplan-website. + --web-root govoplan-website checkout. Defaults to ../govoplan-website. --public-base-url Public website URL. Defaults to https://govoplan.add-ideas.de. --npm npm executable used for optional web build. - --build-web Run npm run build in addideas-govoplan-website after generating files. - --commit Commit generated catalog files in addideas-govoplan-website. - --tag Tag addideas-govoplan-website with catalog-v. Implies --commit. - --push Push addideas-govoplan-website branch and tag. Implies --commit. + --build-web Run npm run build in govoplan-website after generating files. + --commit Commit generated catalog files in govoplan-website. + --tag Tag govoplan-website with catalog-v. Implies --commit. + --push Push govoplan-website branch and tag. Implies --commit. --remote Git remote for push. Defaults to origin. - --branch Branch to push. Defaults to current addideas-govoplan-website branch. + --branch Branch to push. Defaults to current govoplan-website branch. -n, --dry-run Print commands and validate inputs without writing git changes. -h, --help Show this help. USAGE @@ -42,7 +42,7 @@ META_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)" PARENT="$(dirname "$META_ROOT")" CORE_ROOT="${GOVOPLAN_CORE_ROOT:-$PARENT/govoplan-core}" CORE_ROOT="$(cd "$CORE_ROOT" && pwd)" -WEB_ROOT="$PARENT/addideas-govoplan-website" +WEB_ROOT="$PARENT/govoplan-website" VERSION="" CHANNEL="stable" SEQUENCE="" @@ -176,14 +176,14 @@ done [[ "$PROFILE" == "base" || "$PROFILE" == "full" ]] || fail "profile must be base or full: $PROFILE" [[ ${#SIGNING_KEYS[@]} -gt 0 ]] || fail "at least one --catalog-signing-key is required" [[ -d "$CORE_ROOT/.git" ]] || fail "not a govoplan-core git repo: $CORE_ROOT" -[[ -d "$WEB_ROOT/.git" ]] || fail "not an addideas-govoplan-website git repo: $WEB_ROOT" +[[ -d "$WEB_ROOT/.git" ]] || fail "not an govoplan-website git repo: $WEB_ROOT" command -v "$PYTHON" >/dev/null 2>&1 || fail "Python not found: $PYTHON" command -v "$NPM_BIN" >/dev/null 2>&1 || fail "npm not found: $NPM_BIN" if [[ -z "$BRANCH" ]]; then BRANCH="$(git -C "$WEB_ROOT" symbolic-ref --quiet --short HEAD || true)" fi -[[ -n "$BRANCH" ]] || fail "cannot infer addideas-govoplan-website branch; pass --branch" +[[ -n "$BRANCH" ]] || fail "cannot infer govoplan-website branch; pass --branch" CATALOG_PATH="$WEB_ROOT/public/catalogs/v1/channels/$CHANNEL.json" KEYRING_PATH="$WEB_ROOT/public/catalogs/v1/keyring.json" @@ -257,7 +257,7 @@ if [[ "$COMMIT" -eq 1 ]]; then run git -C "$WEB_ROOT" add -A "$CATALOG_PATH" "$KEYRING_PATH" "$MODULE_DIRECTORY_PATH" if [[ "$DRY_RUN" -eq 0 ]]; then if git -C "$WEB_ROOT" diff --cached --quiet; then - echo "No addideas-govoplan-website catalog changes to commit." + echo "No govoplan-website catalog changes to commit." else run git -C "$WEB_ROOT" commit -m "Publish GovOPlaN v$VERSION $CHANNEL catalog" fi @@ -268,7 +268,7 @@ fi if [[ "$TAG_WEB" -eq 1 ]]; then if git -C "$WEB_ROOT" rev-parse --quiet --verify "refs/tags/$TAG_NAME" >/dev/null; then - fail "addideas-govoplan-website tag already exists: $TAG_NAME" + fail "govoplan-website tag already exists: $TAG_NAME" fi run git -C "$WEB_ROOT" tag -a "$TAG_NAME" -m "Publish GovOPlaN v$VERSION $CHANNEL catalog" fi diff --git a/tools/release/push-release-tag.sh b/tools/release/push-release-tag.sh index 1f7afd7..7731756 100644 --- a/tools/release/push-release-tag.sh +++ b/tools/release/push-release-tag.sh @@ -30,9 +30,9 @@ Options: latest migration release baseline. --skip-migration-audit Do not run the release migration audit. --publish-web-catalog After core/modules are pushed, publish a signed release - catalog into addideas-govoplan-website. - --web-root addideas-govoplan-website checkout for --publish-web-catalog. - Defaults to ../addideas-govoplan-website. + catalog into govoplan-website. + --web-root govoplan-website checkout for --publish-web-catalog. + Defaults to ../govoplan-website. --catalog-signing-key Catalog signing key for --publish-web-catalog. May be repeated during key rotation. @@ -44,7 +44,7 @@ Options: --catalog-public-url Public website URL. Defaults to https://govoplan.add-ideas.de. - --build-web-catalog Run npm run build in addideas-govoplan-website before committing the + --build-web-catalog Run npm run build in govoplan-website before committing the catalog update. --npm npm executable for lockfile generation. -y, --yes Do not prompt before committing, tagging, and pushing. @@ -174,7 +174,7 @@ GENERATE_RELEASE_LOCK=1 MIGRATION_AUDIT_MODE="auto" NPM_BIN="${NPM:-}" PUBLISH_WEB_CATALOG=0 -WEB_ROOT="$PARENT/addideas-govoplan-website" +WEB_ROOT="$PARENT/govoplan-website" CATALOG_CHANNEL="stable" CATALOG_SEQUENCE="" CATALOG_EXPIRES_DAYS="90" @@ -813,7 +813,7 @@ if ! command -v "$NPM_BIN" >/dev/null 2>&1; then fail "npm executable not found: $NPM_BIN" fi if [[ "$PUBLISH_WEB_CATALOG" -eq 1 ]]; then - [[ -d "$WEB_ROOT/.git" ]] || fail "addideas-govoplan-website repo not found: $WEB_ROOT" + [[ -d "$WEB_ROOT/.git" ]] || fail "govoplan-website repo not found: $WEB_ROOT" [[ -x "$META_ROOT/tools/release/publish-release-catalog.sh" ]] || fail "missing executable catalog publisher: $META_ROOT/tools/release/publish-release-catalog.sh" fi diff --git a/tools/release/release-doctor.py b/tools/release/release-doctor.py index 26514c5..6870d53 100644 --- a/tools/release/release-doctor.py +++ b/tools/release/release-doctor.py @@ -521,7 +521,7 @@ def migration_findings(migration_audits: dict[str, dict[str, Any]], *, target_ve def collect_catalog_state(*, workspace_root: Path, target_version: str | None, online: bool) -> dict[str, Any]: - web_root = workspace_root / "addideas-govoplan-website" + web_root = workspace_root / "govoplan-website" catalog_path = web_root / "public" / "catalogs" / "v1" / "channels" / "stable.json" keyring_path = web_root / "public" / "catalogs" / "v1" / "keyring.json" state: dict[str, Any] = {