From ccb872adac9d0f9c2157259fd450de3339ab8679 Mon Sep 17 00:00:00 2001 From: notplants Date: Thu, 11 Feb 2021 12:54:53 +0100 Subject: [PATCH 1/4] Add -d option for build_packages to ensure default branch --- scripts/build_packages.py | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/scripts/build_packages.py b/scripts/build_packages.py index 28e47d8..86e824a 100644 --- a/scripts/build_packages.py +++ b/scripts/build_packages.py @@ -2,15 +2,37 @@ 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) + print("default: {}".format(default_branch)) + branch = default_branch.replace('origin/', '').strip() + print("branch: {}".format(branch)) + 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, From 17c356b07bb7d701de9b30511eaa5e0fe6c5f0d0 Mon Sep 17 00:00:00 2001 From: notplants Date: Fri, 19 Feb 2021 16:27:44 +0100 Subject: [PATCH 2/4] Bump version number --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. From 42cc1a80d27f6e7919ce29afb9e4477c4f80b445 Mon Sep 17 00:00:00 2001 From: notplants Date: Fri, 19 Feb 2021 16:29:42 +0100 Subject: [PATCH 3/4] Remove extra print statements --- scripts/build_packages.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/build_packages.py b/scripts/build_packages.py index 86e824a..62d4dee 100644 --- a/scripts/build_packages.py +++ b/scripts/build_packages.py @@ -3,7 +3,6 @@ from constants import * import subprocess import argparse -import sys import os @@ -27,9 +26,7 @@ for service in SERVICES: # 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) - print("default: {}".format(default_branch)) branch = default_branch.replace('origin/', '').strip() - print("branch: {}".format(branch)) subprocess.run(["git", "checkout", branch], cwd=service_path) subprocess.run(["git", "reset", "HEAD", "--hard"], cwd=service_path) subprocess.run(["git", "pull"], cwd=service_path) From d95969e132d6fa66ab13cb0a543f6313ad154734 Mon Sep 17 00:00:00 2001 From: notplants Date: Fri, 19 Feb 2021 16:37:02 +0100 Subject: [PATCH 4/4] Add missing import --- scripts/build_packages.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build_packages.py b/scripts/build_packages.py index 62d4dee..75969c4 100644 --- a/scripts/build_packages.py +++ b/scripts/build_packages.py @@ -3,6 +3,7 @@ from constants import * import subprocess import argparse +import sys import os