Compare commits
No commits in common. "6992be4e56352df4054220dd4be9feb2f7f6f7d7" and "1d58ab74c6212e33776f28046cf15de4e65e118b" have entirely different histories.
6992be4e56
...
1d58ab74c6
|
|
@ -1,5 +1,5 @@
|
|||
cmake_minimum_required(VERSION 3.25)
|
||||
project(COSC-4P80-Assignment-1 VERSION 13.7.0)
|
||||
project(COSC-4P80-Assignment-1 VERSION 13.0.0)
|
||||
|
||||
option(ENABLE_ADDRSAN "Enable the address sanitizer" OFF)
|
||||
option(ENABLE_UBSAN "Enable the ub sanitizer" OFF)
|
||||
|
|
|
|||
118
commit.py
118
commit.py
|
|
@ -24,19 +24,14 @@ USER_HOME = Path.home()
|
|||
ENVIRONMENT_DATA_LOCATION = USER_HOME / ".brett_scripts.env"
|
||||
|
||||
if sys.platform.startswith("win"):
|
||||
CONFIG_FILE_DIRECTORY = Path(os.getenv('APPDATA') + "\blt")
|
||||
CONFIG_FILE_LOCATION = Path(CONFIG_FILE_DIRECTORY + "\commit_config.json")
|
||||
CONFIG_FILE_DIRECTORY = Path(os.getenv('APPDATA') + "\BLT")
|
||||
CONFIG_FILE_LOCATION = Path(CONFIG_FILE_DIRECTORY + "\commit_config.env")
|
||||
else:
|
||||
XDG_CONFIG_HOME = os.environ.get('XDG_CONFIG_HOME')
|
||||
if XDG_CONFIG_HOME is None:
|
||||
XDG_CONFIG_HOME = USER_HOME / ".config"
|
||||
else:
|
||||
XDG_CONFIG_HOME = Path(XDG_CONFIG_HOME)
|
||||
|
||||
XDG_CONFIG_HOME = Path(os.environ.get('XDG_CONFIG_HOME'))
|
||||
if len(str(XDG_CONFIG_HOME)) == 0:
|
||||
XDG_CONFIG_HOME = USER_HOME
|
||||
CONFIG_FILE_DIRECTORY = XDG_CONFIG_HOME / "blt"
|
||||
CONFIG_FILE_LOCATION = CONFIG_FILE_DIRECTORY / "commit_config.json"
|
||||
CONFIG_FILE_LOCATION = CONFIG_FILE_DIRECTORY / "commit_config.env"
|
||||
|
||||
class Config:
|
||||
def __init__(self):
|
||||
|
|
@ -44,32 +39,29 @@ class Config:
|
|||
self.branch_on_major = True
|
||||
self.branch_on_minor = False
|
||||
self.release_on_major = True
|
||||
self.release_on_minor = True
|
||||
self.release_on_minor = False
|
||||
self.main_branch = "main"
|
||||
self.patch_limit = -1
|
||||
|
||||
def toJSON(self):
|
||||
return json.dumps(self, default=lambda o: o.__dict__, sort_keys=True, indent=4)
|
||||
|
||||
def fromJSON(file):
|
||||
with open(file, "r") as f:
|
||||
j = json.load(f)
|
||||
obj = Config()
|
||||
[setattr(obj, key, val) for key, val in j.items() if hasattr(obj, key)]
|
||||
if obj.branch_on_minor:
|
||||
obj.branch_on_major = True
|
||||
return obj
|
||||
|
||||
def from_file(file):
|
||||
values = {}
|
||||
if (not os.path.exists(file)):
|
||||
return Config()
|
||||
|
||||
with open(file, "r") as f:
|
||||
j = json.load(f)
|
||||
obj = Config()
|
||||
[setattr(obj, key, val) for key, val in j.items() if hasattr(obj, key)]
|
||||
return obj
|
||||
with open(file, "rt") as f:
|
||||
for line in f:
|
||||
if line.startswith("export"):
|
||||
content = line.split("=")
|
||||
for idx, c in enumerate(content):
|
||||
content[idx] = c.replace("export", "").strip()
|
||||
values[content[0]] = content[1].replace("\"", "").replace("'", "")
|
||||
config = Config()
|
||||
config.branch_on_major = values["branch_on_major"].lower() == "true"
|
||||
config.release_on_major = values["release_on_major"].lower() == "true"
|
||||
config.main_branch = values["main_branch"]
|
||||
config.patch_limit = int(values["patch_limit"])
|
||||
|
||||
return config;
|
||||
|
||||
def save_to_file(self, file):
|
||||
dir_index = str(file).rfind("/")
|
||||
|
|
@ -77,8 +69,11 @@ class Config:
|
|||
if not os.path.exists(dir):
|
||||
print(f"Creating config directory {dir}")
|
||||
os.makedirs(dir)
|
||||
with open(file, "w") as f:
|
||||
json.dump(self, f, default=lambda o: o.__dict__, sort_keys=True, indent=4)
|
||||
with open(file, 'w') as f:
|
||||
f.write("export branch_on_major=" + str(self.branch_on_major) + "\n")
|
||||
f.write("export release_on_major=" + str(self.release_on_major) + "\n")
|
||||
f.write('export main_branch="' + self.main_branch + '"' + "\n")
|
||||
f.write("export patch_limit=" + str(self.patch_limit) + "\n")
|
||||
|
||||
|
||||
class EnvData:
|
||||
|
|
@ -146,6 +141,7 @@ def recombine(cmake_text, version_parts, begin, end):
|
|||
constructed_text_end = cmake_text[end::]
|
||||
return constructed_text_begin + constructed_version + constructed_text_end
|
||||
|
||||
|
||||
def inc_major(cmake_text):
|
||||
version_parts, begin, end = split_version(cmake_text)
|
||||
version_parts[0] = str(int(version_parts[0]) + 1)
|
||||
|
|
@ -171,12 +167,6 @@ def make_branch(config: Config, name):
|
|||
subprocess.call(["git", "checkout", "-b", name])
|
||||
subprocess.call(["git", "merge", config.main_branch])
|
||||
subprocess.call(["git", "checkout", config.main_branch])
|
||||
|
||||
def sync_branch(config: Config, version_parts, args):
|
||||
if config.branch_on_major:
|
||||
# Branch will be created.
|
||||
if args.minor:
|
||||
return;
|
||||
|
||||
def make_release(env: EnvData, name):
|
||||
print(f"Making new release {name}")
|
||||
|
|
@ -186,10 +176,11 @@ def make_release(env: EnvData, name):
|
|||
origin = ''.join(itertools.takewhile(str.isalpha, line.decode('utf8')))
|
||||
urls.append("https://api.github.com/repos/" + open_process(["git", "remote", "get-url", origin], False)[0].decode('utf8').replace("\n", "").replace("https://github.com/", "") + "/releases")
|
||||
urls = set(urls)
|
||||
print(f"Urls: {urls}")
|
||||
data = {
|
||||
'tag_name': name,
|
||||
'name': name,
|
||||
'body': "Automated Release '" + name + "'",
|
||||
'body': "Automated Release",
|
||||
'draft': False,
|
||||
'prerelease': False
|
||||
}
|
||||
|
|
@ -218,19 +209,12 @@ def main():
|
|||
parser.add_argument("-p", "--patch", action='store_true', default=False, required=False)
|
||||
parser.add_argument("-m", "--minor", action='store_true', default=False, required=False)
|
||||
parser.add_argument("-M", "--major", action='store_true', default=False, required=False)
|
||||
parser.add_argument('-e', "--env", help="environment file", required=False, default=None)
|
||||
parser.add_argument('-c', "--config", help="config file", required=False, default=None)
|
||||
parser.add_argument("--create-default-config", action="store_true", default=False, required=False)
|
||||
parser.add_argument("--no-release", action="store_true", default=False, required=False)
|
||||
parser.add_argument("--no-branch", action="store_true", default=False, required=False)
|
||||
parser.add_argument('-e', "--env", help="environment file", required=False)
|
||||
parser.add_argument('-c', "--config", help="config file", required=False)
|
||||
parser.add_argument("--create_default_config", action="store_true", default=False, required=False)
|
||||
|
||||
args = parser.parse_args()
|
||||
|
||||
if args.create_default_config:
|
||||
config = Config()
|
||||
config.save_to_file(args.config if args.config is not None else CONFIG_FILE_LOCATION)
|
||||
return
|
||||
|
||||
if args.env is not None:
|
||||
env = EnvData.get_env_from_file(args.e)
|
||||
else:
|
||||
|
|
@ -240,6 +224,9 @@ def main():
|
|||
config = Config.from_file(args.config)
|
||||
else:
|
||||
config = Config.from_file(CONFIG_FILE_LOCATION)
|
||||
|
||||
if args.create_default_config:
|
||||
config.save_to_file(args.config if args.config is not None else CONFIG_FILE_LOCATION)
|
||||
|
||||
cmake_text = load_cmake()
|
||||
cmake_version = get_version(cmake_text)[0]
|
||||
|
|
@ -272,45 +259,24 @@ def main():
|
|||
print("Selected patch")
|
||||
write_cmake(inc_patch(config, cmake_text))
|
||||
|
||||
|
||||
subprocess.call(["git", "add", "*"])
|
||||
subprocess.call(["git", "commit"])
|
||||
|
||||
cmake_text = load_cmake()
|
||||
version_parts = split_version(cmake_text)[0]
|
||||
if args.major:
|
||||
version_parts = split_version(cmake_text)[0]
|
||||
if config.branch_on_major:
|
||||
if not args.no_branch:
|
||||
make_branch(config, "v" + str(version_parts[0]))
|
||||
|
||||
if args.minor:
|
||||
make_branch(config, "v" + str(version_parts[0]))
|
||||
if config.branch_on_minor:
|
||||
if not args.no_branch:
|
||||
make_branch(config, "v" + str(version_parts[0]) + "." + str(version_parts[1]))
|
||||
elif config.branch_on_major:
|
||||
subprocess.call(["git", "checkout", "v" + str(version_parts[0])])
|
||||
subprocess.call(["git", "rebase", config.main_branch])
|
||||
subprocess.call(["git", "checkout", config.main_branch])
|
||||
|
||||
if args.patch:
|
||||
if config.branch_on_minor:
|
||||
subprocess.call(["git", "checkout", "v" + str(version_parts[0]) + "." + str(version_parts[1])])
|
||||
subprocess.call(["git", "rebase", config.main_branch])
|
||||
subprocess.call(["git", "checkout", config.main_branch])
|
||||
elif config.branch_on_major:
|
||||
subprocess.call(["git", "checkout", "v" + str(version_parts[0])])
|
||||
subprocess.call(["git", "rebase", config.main_branch])
|
||||
subprocess.call(["git", "checkout", config.main_branch])
|
||||
|
||||
sync_branch(config=config, version_parts=version_parts, args=args)
|
||||
|
||||
subprocess.call(["sh", "-c", "git remote | xargs -L1 git push --all"])
|
||||
|
||||
if args.major:
|
||||
if not args.no_release and config.release_on_major:
|
||||
make_branch(config, "v" + str(version_parts[0]) + "." + str(version_parts[1]))
|
||||
if config.release_on_major:
|
||||
make_release(env, "v" + str(version_parts[0]))
|
||||
if args.minor:
|
||||
if not args.no_release and config.release_on_minor:
|
||||
if config.release_on_minor:
|
||||
make_release(env, "v" + str(version_parts[0]) + "." + str(version_parts[1]))
|
||||
|
||||
|
||||
subprocess.call(["sh", "-c", "git remote | xargs -L1 git push --all"])
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
|
|
|||
Loading…
Reference in New Issue