rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'pull-webapp-from-fork' into 'v3'

Browse source 
Add -p argument to pull_webapp for setting GitLab project ID

See merge request openflexure/openflexure-microscope-server!573
This commit is contained in:
Joe Knapper 2026-04-30 11:26:39 +00:00
commit 62d1724db6
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pull_webapp.py
View file

@ -16,6 +16,7 @@ import os
import shutil import shutil
import sys import sys
import zipfile import zipfile
from typing import Optional
import gitlab import gitlab
from gitlab.exceptions import GitlabGetError from gitlab.exceptions import GitlabGetError
@ -42,16 +43,19 @@ def extract_zip(zip_data: bytes) -> None:
print(f"Extracted zip to: {THIS_DIR}") print(f"Extracted zip to: {THIS_DIR}")
def main(branch: str = "v3") -> None: def main(branch: str = "v3", project: Optional[str] = None) -> None:
"""Fetch build artifacts from GitLab for a given branch and unzip. """Fetch build artifacts from GitLab for a given branch and unzip.
Clear any existing static directory before extract the new files. Clear any existing static directory before extract the new files.
:param branch: The Git branch name to fetch artifacts from. :param branch: The Git branch name to fetch artifacts from.
:param project: The GitLab project ID if pulling from a fork. Use None for
pulling from the main openflexure GitLab.
""" """
project_id = 9238334 if project is None else int(project)
try: try:
gl = gitlab.Gitlab() gl = gitlab.Gitlab()
ofm_repo = gl.projects.get(9238334) ofm_repo = gl.projects.get(project_id)
zip_data = ofm_repo.artifacts.download(branch, "build") zip_data = ofm_repo.artifacts.download(branch, "build")
except GitlabGetError as e: except GitlabGetError as e:
@ -75,6 +79,12 @@ if __name__ == "__main__":
default="v3", default="v3",
help="Git branch to fetch artifacts from (default: v3)", help="Git branch to fetch artifacts from (default: v3)",
) )
parser.add_argument(
"-p",
"--project",
default=None,
help="The GitLab project ID if using a fork",
)
args = parser.parse_args() args = parser.parse_args()
main(branch=args.branch) main(branch=args.branch, project=args.project)