mirror of
https://github.com/SideStore/SideStore.git
synced 2026-02-27 23:47:39 +01:00
CI: improve more ci worflow
This commit is contained in:
@@ -55,6 +55,12 @@ def main():
|
|||||||
required=True,
|
required=True,
|
||||||
help="Output Directory where source_metadata.json is written",
|
help="Output Directory where source_metadata.json is written",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
p.add_argument(
|
||||||
|
"--output-name",
|
||||||
|
default="source_metadata.json",
|
||||||
|
help="Output metadata filename",
|
||||||
|
)
|
||||||
|
|
||||||
p.add_argument(
|
p.add_argument(
|
||||||
"--release-notes-dir",
|
"--release-notes-dir",
|
||||||
@@ -86,7 +92,7 @@ def main():
|
|||||||
notes_dir.mkdir(parents=True, exist_ok=True)
|
notes_dir.mkdir(parents=True, exist_ok=True)
|
||||||
out_dir.mkdir(parents=True, exist_ok=True)
|
out_dir.mkdir(parents=True, exist_ok=True)
|
||||||
|
|
||||||
out_file = out_dir / "source_metadata.json"
|
out_file = out_dir / args.output_name
|
||||||
|
|
||||||
# ------------------------------------------------------
|
# ------------------------------------------------------
|
||||||
# ensure release notes exist
|
# ensure release notes exist
|
||||||
|
|||||||
@@ -257,6 +257,7 @@ def deploy(repo, source_json, release_tag, short_commit, marketing_version, vers
|
|||||||
repo = (ROOT / repo).resolve()
|
repo = (ROOT / repo).resolve()
|
||||||
ipa_path = ROOT / ipa_name
|
ipa_path = ROOT / ipa_name
|
||||||
source_path = repo / source_json
|
source_path = repo / source_json
|
||||||
|
metadata = 'source-metadata.json'
|
||||||
|
|
||||||
if not repo.exists():
|
if not repo.exists():
|
||||||
raise SystemExit(f"{repo} repo missing")
|
raise SystemExit(f"{repo} repo missing")
|
||||||
@@ -267,12 +268,14 @@ def deploy(repo, source_json, release_tag, short_commit, marketing_version, vers
|
|||||||
if not source_path.exists():
|
if not source_path.exists():
|
||||||
raise SystemExit(f"{source_json} missing inside repo")
|
raise SystemExit(f"{source_json} missing inside repo")
|
||||||
|
|
||||||
|
|
||||||
run(
|
run(
|
||||||
f"python3 {SCRIPTS}/generate_source_metadata.py "
|
f"python3 {SCRIPTS}/generate_source_metadata.py "
|
||||||
f"--repo-root {ROOT} "
|
f"--repo-root {ROOT} "
|
||||||
f"--ipa {ipa_path} "
|
f"--ipa {ipa_path} "
|
||||||
f"--output-dir . "
|
f"--output-dir {ROOT} "
|
||||||
f"--release-notes-dir . "
|
f"--output-name {metadata} "
|
||||||
|
f"--release-notes-dir {ROOT} "
|
||||||
f"--release-tag {release_tag} "
|
f"--release-tag {release_tag} "
|
||||||
f"--version {version} "
|
f"--version {version} "
|
||||||
f"--marketing-version {marketing_version} "
|
f"--marketing-version {marketing_version} "
|
||||||
@@ -291,7 +294,7 @@ def deploy(repo, source_json, release_tag, short_commit, marketing_version, vers
|
|||||||
run("git reset --hard FETCH_HEAD", check=False, cwd=repo)
|
run("git reset --hard FETCH_HEAD", check=False, cwd=repo)
|
||||||
|
|
||||||
# regenerate after reset so we don't lose changes
|
# regenerate after reset so we don't lose changes
|
||||||
run(f"python3 {SCRIPTS}/update_source_metadata.py '{source_json}'")
|
run(f"python3 {SCRIPTS}/update_source_metadata.py '{ROOT}/{metadata}' '{source_json}'")
|
||||||
run(f"git add --verbose {source_json}", check=False)
|
run(f"git add --verbose {source_json}", check=False)
|
||||||
run(f"git commit -m '{release_tag} - deployed {version}' || true", check=False)
|
run(f"git commit -m '{release_tag} - deployed {version}' || true", check=False)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user