Skip to content

Agent Zero AI framework

Add fallback environment variable support and improve error handling in Docker release workflow

frdel43a519f522a6
diff --git a/.github/scripts/docker_release_plan.py b/.github/scripts/docker_release_plan.py
index d915a2abe..afba75490 100644
--- a/.github/scripts/docker_release_plan.py
+++ b/.github/scripts/docker_release_plan.py
@@ -77,6 +77,17 @@ def require_env(name: str) -> str:
return value
+def require_any_env(*names: str) -> str:
+ for name in names:
+ value = os.environ.get(name, "").strip()
+ if value:
+ return value
+ fail(
+ "Required environment variable is missing. Expected one of: "
+ + ", ".join(f"`{name}`" for name in names)
+ )
+
+
@dataclass(frozen=True)
class Config:
allowed_branches: list[str]
@@ -607,7 +618,7 @@ def extract_openrouter_message_content(payload: object) -> str:
def generate_release_body_with_openrouter(commits: list[CommitEntry]) -> str:
api_key = require_env("OPENROUTER_API_KEY")
- model = require_env("OPENROUTER_MODEL_NAME")
+ model = require_any_env("OPENROUTER_MODEL_NAME", "OPENROUTER_MODEL")
system_prompt = load_text(OPENROUTER_SYSTEM_PROMPT_PATH)
repository = require_env("GITHUB_REPOSITORY")
user_message = build_release_notes_user_message(commits)
@@ -704,6 +715,11 @@ def resolve_release_command() -> None:
f"Release note generation failed for `{source_tag}`. Falling back to a static release body.",
file=sys.stderr,
)
+ except Exception as exc:
+ print(
+ f"Unexpected release note generation error for `{source_tag}`: {exc}. Falling back to a static release body.",
+ file=sys.stderr,
+ )
write_output("should_release", "true")
write_output("release_tag", source_tag)
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 8d688f5ab..617ee31e6 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -94,7 +94,6 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- ref: ${{ matrix.source_tag }}
- name: Fetch remote branches and tags
run: git fetch --force --tags origin '+refs/heads/*:refs/remotes/origin/*'
@@ -173,6 +172,7 @@ jobs:
DOCKER_IMAGE_REPO: ${{ format('{0}/{1}', secrets.DOCKERHUB_ORG, env.DOCKER_IMAGE_NAME) }}
TARGET_BRANCH: ${{ matrix.branch }}
TARGET_TAG: ${{ matrix.source_tag }}
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
OPENROUTER_API_KEY: ${{ secrets.OPENROUTER_API_KEY }}
OPENROUTER_MODEL_NAME: ${{ vars.OPENROUTER_MODEL_NAME }}
run: python3 .github/scripts/docker_release_plan.py resolve-release