ci: align publish auth with TDLMPack / org secret pattern
Keep secrets.TDLM_PACK_TOKEN (same name as pack.yml); document that it is currently a TDLMPack repo secret while MAVEN_* are org-level. Fall back to github.token so release can proceed after merge without a new HMCL-only secret when the pack token is promoted or unavailable.
This commit is contained in:
1 parent
6434573105
commit
9de2d8eeef
2 files changed
+34
-5
No files matched your search
@@ -6,6 +6,13 @@ name: Publish TDLM launcher
|
||||
#
|
||||
# Mirrors TDLM/TDLMPack's pack.yml publish style (nest API host; Cloudflare
|
||||
# in front of git.potatolab.uk blocks Python urllib for large uploads).
|
||||
#
|
||||
# Auth (same name as TDLMPack pack.yml):
|
||||
# secrets.TDLM_PACK_TOKEN — Gitea API token with package + release write.
|
||||
# Prefer an *org* secret (like MAVEN_USER/MAVEN_PASSWORD) so HMCL inherits it;
|
||||
# today it exists only as a TDLMPack *repo* secret unless promoted.
|
||||
# Falls back to github.token when TDLM_PACK_TOKEN is unset (same-repo release;
|
||||
# org generic packages may still need the pack token).
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
@@ -82,14 +89,20 @@ jobs:
|
||||
# Stable player/CI channel: overwritten in place under tdlm-hmcl/latest.
|
||||
- name: Publish generic package tdlm-hmcl/latest
|
||||
env:
|
||||
# Same secret name as TDLM/TDLMPack pack.yml (org or repo). Not MAVEN_*.
|
||||
TDLM_PACK_TOKEN: ${{ secrets.TDLM_PACK_TOKEN }}
|
||||
GITHUB_TOKEN: ${{ github.token }}
|
||||
GITEA_PACKAGE_ROOT: https://git.nest.potatolab.uk:8443/api/packages/TDLM/generic/tdlm-hmcl/latest
|
||||
run: |
|
||||
python3 - <<'PY'
|
||||
import os, pathlib, urllib.error, urllib.parse, urllib.request
|
||||
token = os.environ.get("TDLM_PACK_TOKEN", "")
|
||||
token = (os.environ.get("TDLM_PACK_TOKEN") or os.environ.get("GITHUB_TOKEN") or "").strip()
|
||||
token_src = "TDLM_PACK_TOKEN" if os.environ.get("TDLM_PACK_TOKEN", "").strip() else "github.token"
|
||||
if not token:
|
||||
raise SystemExit("TDLM_PACK_TOKEN is required to publish tdlm-hmcl (same org secret as TDLMPack)")
|
||||
raise SystemExit(
|
||||
"Need secrets.TDLM_PACK_TOKEN (promote TDLMPack's repo secret to org, like MAVEN_*) "
|
||||
"or a usable github.token to publish tdlm-hmcl")
|
||||
print("auth=" + token_src)
|
||||
upload_root = os.environ["GITEA_PACKAGE_ROOT"].rstrip("/")
|
||||
root = pathlib.Path("build/tdlm-hmcl")
|
||||
|
||||
@@ -117,6 +130,7 @@ jobs:
|
||||
env:
|
||||
RELEASE_TAG: ${{ inputs.release_tag }}
|
||||
TDLM_PACK_TOKEN: ${{ secrets.TDLM_PACK_TOKEN }}
|
||||
GITHUB_TOKEN: ${{ github.token }}
|
||||
GITEA_API_URL: https://git.nest.potatolab.uk:8443/api/v1
|
||||
GITEA_PACKAGE_ROOT: https://git.nest.potatolab.uk:8443/api/packages/TDLM/generic/tdlm-hmcl/latest
|
||||
TARGET_COMMIT: ${{ github.sha }}
|
||||
@@ -124,12 +138,15 @@ jobs:
|
||||
python3 - <<'PY'
|
||||
import json, os, urllib.error, urllib.parse, urllib.request
|
||||
tag = os.environ["RELEASE_TAG"].strip()
|
||||
token = os.environ.get("TDLM_PACK_TOKEN", "")
|
||||
token = (os.environ.get("TDLM_PACK_TOKEN") or os.environ.get("GITHUB_TOKEN") or "").strip()
|
||||
token_src = "TDLM_PACK_TOKEN" if os.environ.get("TDLM_PACK_TOKEN", "").strip() else "github.token"
|
||||
api = os.environ["GITEA_API_URL"].rstrip("/") + "/repos/TDLM/HMCL"
|
||||
package_root = os.environ["GITEA_PACKAGE_ROOT"].rstrip("/")
|
||||
target = os.environ.get("TARGET_COMMIT", "main").strip() or "main"
|
||||
if not token:
|
||||
raise SystemExit("TDLM_PACK_TOKEN is required to publish the release")
|
||||
raise SystemExit(
|
||||
"Need secrets.TDLM_PACK_TOKEN (org-preferred, same as TDLMPack) or github.token")
|
||||
print("auth=" + token_src)
|
||||
if not tag:
|
||||
raise SystemExit("release_tag is empty")
|
||||
|
||||
|
||||
+13
-1
@@ -7,7 +7,19 @@ under the `tdlm-client/latest` layout. Players install the launcher separately.
|
||||
## After this repo’s publish workflow
|
||||
|
||||
Run **Actions → Publish TDLM launcher → Run workflow** with a new `release_tag`.
|
||||
Requires repo secret `TDLM_PACK_TOKEN` (same org token TDLMPack uses for package/release uploads).
|
||||
|
||||
### Secrets (sibling pattern)
|
||||
|
||||
| Name | Where it lives today | Used by |
|
||||
|---|---|---|
|
||||
| `MAVEN_USER` / `MAVEN_PASSWORD` | **Org** secrets | Stratum / mod Maven publish — **not** used for launcher binaries |
|
||||
| `TDLM_PACK_TOKEN` | **TDLMPack repo** secret only (not org) | TDLMPack `pack.yml` Gitea package + release uploads |
|
||||
| `github.token` | Actions runtime | HMCL publish fallback when `TDLM_PACK_TOKEN` is unset |
|
||||
|
||||
HMCL `publish-tdlm.yml` uses the **same name** as TDLMPack: `secrets.TDLM_PACK_TOKEN`, then falls back to `github.token`.
|
||||
Org Maven secrets cannot publish Gitea generic packages / releases.
|
||||
|
||||
**Recommended:** promote `TDLM_PACK_TOKEN` to an **org** secret (like `MAVEN_*`) so HMCL inherits it with no new repo secret. Until then, either copy it onto `TDLM/HMCL` or rely on `github.token` (same-repo release usually works; org `tdlm-hmcl` package write may still need the pack token).
|
||||
|
||||
### 1. Stable generic URLs (preferred for README / curl / CI)
|
||||
|
||||
|
||||
Reference in new issue
Block a user