jingrow/bench
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix get-app error

Browse Source
This commit is contained in:
jingrow 2025-04-07 18:10:28 +08:00
parent 8c8a0b35e1
commit 7e94fe41ed
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bench/app.py
View File

@ -157,7 +157,7 @@ class AppMeta:
return self.get_http_url() return self.get_http_url()
def get_http_url(self): def get_http_url(self):
return f"https://{self.remote_server}/{self.org}/{self.repo}.git" return f"http://{self.remote_server}/{self.org}/{self.repo}.git"
def get_ssh_url(self): def get_ssh_url(self):
return f"git@{self.remote_server}:{self.org}/{self.repo}.git" return f"git@{self.remote_server}:{self.org}/{self.repo}.git"

30
bench/utils/__init__.py
View File

@ -430,23 +430,27 @@ def get_env_jingrow_commands(bench_path=".") -> List:
def find_org(org_repo, using_cached: bool = False): def find_org(org_repo, using_cached: bool = False):
import requests import requests
org_repo = org_repo[0] org_repo = org_repo[0]
for org in ["jingrow", "jerp"]: for org in ["jingrow", "jerp"]:
res = requests.head(f"http://git.jingrow.com:3000/api/v1/repos/{org}/{org_repo}") url = f"http://git.jingrow.com:3000/api/v1/repos/{org}/{org_repo}"
if res.status_code in (400, 403): res = requests.get(url)
res = requests.head(f"http://git.jingrow.com:3000/{org}/{org_repo}")
if res.ok: if res.status_code in (400, 403):
return org, org_repo url2 = f"http://git.jingrow.com:3000/{org}/{org_repo}"
res = requests.get(url2)
if res.ok:
return org, org_repo
if using_cached: if using_cached:
return "", org_repo return "", org_repo
raise InvalidRemoteException( raise InvalidRemoteException(
f"{org_repo} not found under jingrow or jerp GitHub accounts" f"{org_repo} not found under jingrow or jerp Git accounts"
) )
def fetch_details_from_tag( def fetch_details_from_tag(