From 75126cb2fdd09d6ebff9fb411987c20a60c0178b Mon Sep 17 00:00:00 2001 From: hermes Date: Fri, 4 Sep 2026 16:26:09 +0200 Subject: [PATCH] ci(merge_main): hardcode gitea.rudolf.keenetic.link (GITEA_SERVER_URL empty) (#47) ## Problem Run #67 of `merge_main.yaml` failed with: ``` fatal: unable to access 'https:///admin/brencher.git/': URL rejected: No host part in the URL ``` The `PUSH_TOKEN` secret is now wired up correctly, but `${GITEA_SERVER_URL}` is empty in this Gitea Actions runtime (the variable the env-prefixed runner is supposed to set), so the substituted URL drops the host. ## Fix Hardcode `gitea.rudolf.keenetic.link` in both `merge_main.yaml` and `merge_main_and_squash.yaml`. When the runner exposes `GITEA_SERVER_URL` in a future version, this can be replaced back with `${GITEA_SERVER_URL#https://}`. ## Supersedes This is a follow-up to admin/brencher#46 which already wired `secrets.PUSH_TOKEN` but still had the empty env var.Reviewed-on: http://192.168.1.96/admin/brencher/pulls/47 Co-authored-by: hermes --- .github/workflows/merge_main.yaml | 2 +- .github/workflows/merge_main_and_squash.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge_main.yaml b/.github/workflows/merge_main.yaml index b4fab28..770e8d3 100644 --- a/.github/workflows/merge_main.yaml +++ b/.github/workflows/merge_main.yaml @@ -29,7 +29,7 @@ jobs: - name: Fetch all branches run: | - git remote set-url origin "https://x-access-token:${PUSH_TOKEN}@${GITEA_SERVER_URL#https://}/${GITHUB_REPOSITORY}.git" + git remote set-url origin "https://x-access-token:${PUSH_TOKEN}@gitea.rudolf.keenetic.link/${GITHUB_REPOSITORY}.git" git fetch --all --prune - name: Merge every branch onto main diff --git a/.github/workflows/merge_main_and_squash.yaml b/.github/workflows/merge_main_and_squash.yaml index 53c2312..2034229 100644 --- a/.github/workflows/merge_main_and_squash.yaml +++ b/.github/workflows/merge_main_and_squash.yaml @@ -27,7 +27,7 @@ jobs: - name: Fetch all branches run: | - git remote set-url origin "https://x-access-token:${PUSH_TOKEN}@${GITEA_SERVER_URL#https://}/${GITHUB_REPOSITORY}.git" + git remote set-url origin "https://x-access-token:${PUSH_TOKEN}@gitea.rudolf.keenetic.link/${GITHUB_REPOSITORY}.git" git fetch --all --prune - name: Merge every branch onto main