Align website tooling with govoplan-website rename
Dependency Audit / dependency-audit (push) Successful in 1m57s
Deployment Installer / deployment-installer (push) Successful in 7s
Security Audit / security-audit (push) Failing after 12m18s

This commit is contained in:
2026-09-30 14:56:55 +02:00
parent 2ffdb23f69
commit 01162bfc5e
24 changed files with 55 additions and 55 deletions
@@ -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
+1 -1
View File
@@ -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"
+13 -13
View File
@@ -7,8 +7,8 @@ Usage:
tools/release/publish-release-catalog.sh --version <x.y.z> --catalog-signing-key <key-id=/path/private.pem> [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 <x.y.z> Release version without leading v.
@@ -19,15 +19,15 @@ Options:
--catalog-signing-key <key-id=/path/private.pem>
Ed25519 private key. May be repeated for rotation.
--core-root <path> govoplan-core checkout. Defaults to ../govoplan-core.
--web-root <path> addideas-govoplan-website checkout. Defaults to ../addideas-govoplan-website.
--web-root <path> govoplan-website checkout. Defaults to ../govoplan-website.
--public-base-url <url> Public website URL. Defaults to https://govoplan.add-ideas.de.
--npm <path> 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<x.y.z>. 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<x.y.z>. Implies --commit.
--push Push govoplan-website branch and tag. Implies --commit.
--remote <name> Git remote for push. Defaults to origin.
--branch <name> Branch to push. Defaults to current addideas-govoplan-website branch.
--branch <name> 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
+6 -6
View File
@@ -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 <path> addideas-govoplan-website checkout for --publish-web-catalog.
Defaults to ../addideas-govoplan-website.
catalog into govoplan-website.
--web-root <path> govoplan-website checkout for --publish-web-catalog.
Defaults to ../govoplan-website.
--catalog-signing-key <key-id=/path/private.pem>
Catalog signing key for --publish-web-catalog. May be
repeated during key rotation.
@@ -44,7 +44,7 @@ Options:
--catalog-public-url <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 <path> 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
+1 -1
View File
@@ -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] = {