tri11paragon
/
COSC-4P80-Assignment-1
mirror of https://github.com/tri11paragon/COSC-4P80-Assignment-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test minor

v13.4 v13.4
Brett 2024-09-26 20:55:10 -04:00
parent 48dc7fa38c
commit 60258b0ba6
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.25) cmake_minimum_required(VERSION 3.25)
project(COSC-4P80-Assignment-1 VERSION 13.3.0) project(COSC-4P80-Assignment-1 VERSION 13.4.0)
option(ENABLE_ADDRSAN "Enable the address sanitizer" OFF) option(ENABLE_ADDRSAN "Enable the address sanitizer" OFF)
option(ENABLE_UBSAN "Enable the ub sanitizer" OFF) option(ENABLE_UBSAN "Enable the ub sanitizer" OFF)

8
commit.py
View File

@ -212,8 +212,8 @@ def main():
parser.add_argument("-p", "--patch", action='store_true', default=False, required=False) 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", "--minor", action='store_true', default=False, required=False)
parser.add_argument("-M", "--major", 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) parser.add_argument('-e', "--env", help="environment file", required=False, default=None)
parser.add_argument('-c', "--config", help="config file", required=False) 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("--create_default_config", action="store_true", default=False, required=False)
args = parser.parse_args() args = parser.parse_args()
@ -267,10 +267,11 @@ def main():
subprocess.call(["git", "commit"]) subprocess.call(["git", "commit"])
cmake_text = load_cmake() cmake_text = load_cmake()
if args.major:
version_parts = split_version(cmake_text)[0] version_parts = split_version(cmake_text)[0]
if args.major:
if config.branch_on_major: if config.branch_on_major:
make_branch(config, "v" + str(version_parts[0])) make_branch(config, "v" + str(version_parts[0]))
if args.minor:
if config.branch_on_minor: if config.branch_on_minor:
make_branch(config, "v" + str(version_parts[0]) + "." + str(version_parts[1])) make_branch(config, "v" + str(version_parts[0]) + "." + str(version_parts[1]))
@ -279,6 +280,7 @@ def main():
if args.major: if args.major:
if config.release_on_major: if config.release_on_major:
make_release(env, "v" + str(version_parts[0])) make_release(env, "v" + str(version_parts[0]))
if args.minor:
if config.release_on_minor: if config.release_on_minor:
make_release(env, "v" + str(version_parts[0]) + "." + str(version_parts[1])) make_release(env, "v" + str(version_parts[0]) + "." + str(version_parts[1]))