diff --git a/peach_package_builder/build_packages.py b/peach_package_builder/build_packages.py index cfca70d..25281d7 100644 --- a/peach_package_builder/build_packages.py +++ b/peach_package_builder/build_packages.py @@ -9,10 +9,11 @@ def build_packages(default_branch=False, package=None): :param default_branch: checks out main git branch if True :param package: if provided, only builds this package """ + if package: + print("[ BUILDING ONLY {} ]".format(package)) build_rust_packages(default_branch=default_branch, package=package) print("[ MICROSERVICE PACKAGE ARCHIVE UPDATED ]") - if __name__ == '__main__': parser = argparse.ArgumentParser() parser.add_argument( @@ -24,7 +25,9 @@ if __name__ == '__main__': parser.add_argument( "-p", "--package", - help="Ensure default branch for all repos for build", + help="Optionally specify package to build", + required=False, + default=None ) args = parser.parse_args() build_packages(default_branch=args.default, package=args.package) \ No newline at end of file diff --git a/peach_package_builder/build_rust_packages.py b/peach_package_builder/build_rust_packages.py index 246f03a..21b8211 100644 --- a/peach_package_builder/build_rust_packages.py +++ b/peach_package_builder/build_rust_packages.py @@ -79,14 +79,6 @@ def build_rust_package(service_path, service_name): add_deb_to_freight(package_name=package_name, package_path=debian_package_path) -def build_packages(default_branch=False): - """ - builds all PeachCloud microservices as .deb files and adds them to the freight repo - """ - build_rust_packages(default_branch=default_branch) - print("[ MICROSERVICE PACKAGE ARCHIVE UPDATED ]") - - if __name__ == '__main__': parser = argparse.ArgumentParser() parser.add_argument( @@ -95,5 +87,12 @@ if __name__ == '__main__': help="Ensure default branch for all repos for build", action="store_true" ) + parser.add_argument( + "-p", + "--package", + help="Optionally specify package to build", + required=False, + default=None + ) args = parser.parse_args() - build_packages(default_branch=args.default) \ No newline at end of file + build_rust_packages(default_branch=args.default, package=args.package) \ No newline at end of file diff --git a/peach_package_builder/constants.py b/peach_package_builder/constants.py index 6769ced..413c870 100644 --- a/peach_package_builder/constants.py +++ b/peach_package_builder/constants.py @@ -19,17 +19,9 @@ USER_PATH = "/home/rust" CARGO_PATH = os.path.join(USER_PATH, ".cargo/bin/cargo") SERVICES = [ - {"name": "peach-buttons", - "repo_url": "https://git.coopcloud.tech/PeachCloud/peach-workspace.git"}, - {"name": "peach-menu", "repo_url": "https://git.coopcloud.tech/PeachCloud/peach-workspace.git"}, - {"name": "peach-monitor", - "repo_url": "https://git.coopcloud.tech/PeachCloud/peach-workspace.git"}, - {"name": "peach-network", - "repo_url": "https://git.coopcloud.tech/PeachCloud/peach-workspace.git"}, - {"name": "peach-oled", "repo_url": "https://git.coopcloud.tech/PeachCloud/peach-workspace.git"}, - {"name": "peach-stats", "repo_url": "https://git.coopcloud.tech/PeachCloud/peach-workspace.git"}, + # peach-probe is disabled until it is fixed # {"name": "peach-probe", "repo_url": "https://git.coopcloud.tech/PeachCloud/peach-workspace.git"}, {"name": "peach-dyndns-updater", "repo_url": "https://git.coopcloud.tech/PeachCloud/peach-workspace.git"}, {"name": "peach-web", "repo_url": "https://git.coopcloud.tech/PeachCloud/peach-workspace.git"}, - # {"name": "peach-tbot", "repo_url": "https://git.coopcloud.tech/PeachCloud/peach-tbot.git"}, + {"name": "peach-config", "repo_url": "https://git.coopcloud.tech/PeachCloud/peach-workspace.git"}, ] \ No newline at end of file