diff --git a/README.md b/README.md index a0e74e4..a0f08f0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # peach-vps -![Generic badge](https://img.shields.io/badge/version-0.3.0-.svg) +![Generic badge](https://img.shields.io/badge/version-0.3.1-.svg) Scripts for configuring the PeachCloud VPS for various hosting and automation functions. diff --git a/scripts/build_packages.py b/scripts/build_packages.py index 28e47d8..75969c4 100644 --- a/scripts/build_packages.py +++ b/scripts/build_packages.py @@ -2,15 +2,35 @@ from constants import * import subprocess +import argparse +import sys import os +parser = argparse.ArgumentParser() +parser.add_argument( + "-d", + "--default", + help="Ensure default branch for all repos for build", + action="store_true" +) +args = parser.parse_args() + + print("[ BUILDING AND UPDATING MICROSERVICE PACKAGES ]") for service in SERVICES: service_name = service["name"] service_path = os.path.join(MICROSERVICES_SRC_DIR, service_name) print("[ BUILIDING SERVICE {} ]".format(service_name)) - subprocess.call(["git", "pull"], cwd=service_path) + # this arg ensures we build the default branch, otherwise we build what ever is found locally + if args.default: + # because some repo have main as default and some as master, we get the default + default_branch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'origin/HEAD'], + cwd=service_path).decode(sys.stdout.encoding) + branch = default_branch.replace('origin/', '').strip() + subprocess.run(["git", "checkout", branch], cwd=service_path) + subprocess.run(["git", "reset", "HEAD", "--hard"], cwd=service_path) + subprocess.run(["git", "pull"], cwd=service_path) debian_package_path = subprocess.run( [ CARGO_PATH,