diff --git a/.github/workflows/merge_flake_lock_update.yml b/.github/workflows/merge_flake_lock_update.yml index e4d34b6..d923269 100644 --- a/.github/workflows/merge_flake_lock_update.yml +++ b/.github/workflows/merge_flake_lock_update.yml @@ -19,5 +19,5 @@ jobs: python -m python.gitea_flake_lock merge --repo "${{ github.repository }}" env: - GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} + JEEVES_BOT_TOKEN: ${{ secrets.JEEVES_BOT_TOKEN }} GITEA_URL: https://gitea.tmmworkshop.com diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml index c929d28..aa126b7 100644 --- a/.github/workflows/update-flake-lock.yml +++ b/.github/workflows/update-flake-lock.yml @@ -18,7 +18,7 @@ jobs: run: nix flake update - name: Create or update flake.lock PR env: - GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} + JEEVES_BOT_TOKEN: ${{ secrets.JEEVES_BOT_TOKEN }} GITEA_URL: https://gitea.tmmworkshop.com run: >- nix develop .#devShells.x86_64-linux.default -c diff --git a/python/gitea_flake_lock.py b/python/gitea_flake_lock.py index c95cbc3..24f45ef 100644 --- a/python/gitea_flake_lock.py +++ b/python/gitea_flake_lock.py @@ -84,13 +84,13 @@ def push_branch(*, branch: str) -> None: run_cmd(["git", "push", "origin", f"HEAD:{branch}", "--force"]) -def _required_gitea_token() -> str: +def _required_jeeves_bot_token() -> str: """Read the required Gitea token from the environment.""" - token = getenv("GITEA_TOKEN") + token = getenv("JEEVES_BOT_TOKEN") if token: return token - msg = "GITEA_TOKEN environment variable is required" + msg = "JEEVES_BOT_TOKEN environment variable is required" raise RuntimeError(msg) @@ -111,7 +111,7 @@ def update( owner, repo_name = split_repo_name(repo) with GiteaClient( base_url=getenv("GITEA_URL", DEFAULT_GITEA_URL), - token=_required_gitea_token(), + token=_required_jeeves_bot_token(), ) as client: pull_request = ensure_flake_lock_pull_request( client, @@ -134,7 +134,7 @@ def merge( owner, repo_name = split_repo_name(repo) with GiteaClient( base_url=getenv("GITEA_URL", DEFAULT_GITEA_URL), - token=_required_gitea_token(), + token=_required_jeeves_bot_token(), ) as client: pull_request = find_flake_lock_pull_request(client, owner=owner, repo=repo_name) if not pull_request: