fix(configs): inline WORKFLOW_* in GiteaActions* ctor; keep only GITEA_TOKEN in secret

The previous split between env vars and constructor args created two
sources of truth for the workflow target. Moving WORKFLOW_OWNER /
WORKFLOW_REPO / WORKFLOW_FILE / WORKFLOW_REF into the constructor
arguments makes the dispatch target obvious at the call site and
keeps the docker secret template minimal (only credentials it must
contain).

README.instruction.md now lists only GIT_USERNAME / GIT_PASSWORD /
GITEA_TOKEN in the `printf` block; WORKFLOW_* are documented in
AGENTS.md (already there) as stack-specific config knobs.
This commit is contained in:
hermes
2026-09-20 17:44:33 +00:00
parent 2b2f66afd0
commit f9eb7a1ffb
2 changed files with 10 additions and 8 deletions
+1 -1
View File
@@ -33,7 +33,7 @@ docker service update --secret-rm brencher-secrets brencher_brencher-backend
docker service update --secret-rm brencher-secrets brencher2_brencher-backend
docker secret rm brencher-secrets
printf "GIT_USERNAME=git\nGIT_PASSWORD=TODO\nGITEA_TOKEN=TODO\nWORKFLOW_REPO=hermes/ansible\nWORKFLOW_FILE=release.yml\nWORKFLOW_REF=master\n" | \
printf "GIT_USERNAME=git\nGIT_PASSWORD=TODO\nGITEA_TOKEN=TODO\n" | \
docker secret create brencher-secrets -
docker service update --secret-add brencher-secrets brencher_brencher-backend
+9 -7
View File
@@ -28,17 +28,19 @@ checkoutMerged = CheckoutMerged(
GITEA_API = os.environ.get("GITEA_API", "https://gitea.rudolf.keenetic.link/api/v1")
GITEA_TOKEN = os.environ.get("GITEA_TOKEN", "")
WORKFLOW_REPO = os.environ.get("WORKFLOW_REPO", "hermes/ansible")
WORKFLOW_FILE = os.environ.get("WORKFLOW_FILE", "release.yml")
WORKFLOW_REF = os.environ.get("WORKFLOW_REF", "master")
WORKFLOW_OWNER = "hermes"
WORKFLOW_REPO = "ansible"
WORKFLOW_FILE = "release.yml"
WORKFLOW_REF = "master"
def _inputs() -> dict:
return {"tag": "auto-" + checkoutMerged.progress().version}
trigger_build = GiteaActionsTrigger(
api_base=GITEA_API,
owner=WORKFLOW_REPO.split("/")[0],
repo=WORKFLOW_REPO.split("/")[1],
owner=WORKFLOW_OWNER,
repo=WORKFLOW_REPO,
workflow_file=WORKFLOW_FILE,
ref=WORKFLOW_REF,
token=GITEA_TOKEN,
@@ -48,8 +50,8 @@ trigger_build = GiteaActionsTrigger(
await_build = GiteaActionsAwait(
api_base=GITEA_API,
owner=WORKFLOW_REPO.split("/")[0],
repo=WORKFLOW_REPO.split("/")[1],
owner=WORKFLOW_OWNER,
repo=WORKFLOW_REPO,
token=GITEA_TOKEN,
run=lambda: trigger_build.progress(),
)