atria-tools/island
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] update new delivery methode

Browse Source
This commit is contained in:
Edouard DUPIN 2019-08-28 01:07:03 +02:00
parent 4b820e9cfb
commit c709ddc730
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
island/actions/islandAction_deliver.py
View File

@ -95,9 +95,12 @@ def execute(_arguments):
# go to the dev branch # go to the dev branch
select_branch = commands.get_current_branch(git_repo_path) select_branch = commands.get_current_branch(git_repo_path)
# Checkout destination branch:
commands.checkout(git_repo_path, destination_branch)
# create new repo tag # create new repo tag
new_version_description = status.create_new_version_repo(git_repo_path, version_description, add_in_version_management, source_branch, destination_branch) new_version_description = status.create_new_version_repo(git_repo_path, version_description, add_in_version_management, source_branch, destination_branch)
debug.info("new version: " + str(version_description)) debug.info("new version: " + str(new_version_description))
# merge branch # merge branch
if mani.deliver_mode == "merge": if mani.deliver_mode == "merge":
@ -108,14 +111,14 @@ def execute(_arguments):
version_path_file = os.path.join(git_repo_path, "version.txt") version_path_file = os.path.join(git_repo_path, "version.txt")
# update version file: # update version file:
tools.file_write_data(version_path_file, tools.version_to_string(version_description)) tools.file_write_data(version_path_file, tools.version_to_string(new_version_description))
commands.add_file(git_repo_path, version_path_file) commands.add_file(git_repo_path, version_path_file)
commands.commit_all(git_repo_path, "[RELEASE] Release v" + tools.version_to_string(version_description)) commands.commit_all(git_repo_path, "[RELEASE] Release v" + tools.version_to_string(new_version_description))
commands.tag(git_repo_path, "v" + tools.version_to_string(version_description)) commands.tag(git_repo_path, "v" + tools.version_to_string(new_version_description))
commands.checkout(git_repo_path, source_branch) commands.checkout(git_repo_path, source_branch)
commands.reset_hard(git_repo_path, destination_branch) commands.reset_hard(git_repo_path, destination_branch)
version_description.append("dev") new_version_description.append("dev")
tools.file_write_data(version_path_file, tools.version_to_string(version_description)) tools.file_write_data(version_path_file, tools.version_to_string(new_version_description))
commands.add_file(git_repo_path, version_path_file) commands.add_file(git_repo_path, version_path_file)
commands.commit_all(git_repo_path, status.default_update_message) commands.commit_all(git_repo_path, status.default_update_message)
commands.checkout(git_repo_path, destination_branch) commands.checkout(git_repo_path, destination_branch)

15
island/actions/islandAction_manifest-deliver.py
View File

@ -98,13 +98,10 @@ def execute(_arguments):
# go to the dev branch # go to the dev branch
select_branch = commands.get_current_branch(git_repo_path) select_branch = commands.get_current_branch(git_repo_path)
# Checkout destination branch:
commands.checkout(git_repo_path, destination_branch)
# create new repo tag # create new repo tag
new_version_description = status.create_new_version_repo(git_repo_path, version_description, add_in_version_management, source_branch, destination_branch) new_version_description = status.create_new_version_repo(git_repo_path, version_description, add_in_version_management, source_branch, destination_branch)
debug.info("new version: " + str(version_description)) debug.info("new version: " + str(new_version_description))
# merge branch # merge branch
commands.checkout(git_repo_path, destination_branch) commands.checkout(git_repo_path, destination_branch)
@ -118,15 +115,15 @@ def execute(_arguments):
version_path_file = os.path.join(git_repo_path, "version.txt") version_path_file = os.path.join(git_repo_path, "version.txt")
# update version file: # update version file:
tools.file_write_data(version_path_file, tools.version_to_string(version_description)) tools.file_write_data(version_path_file, tools.version_to_string(new_version_description))
commands.add_file(git_repo_path, version_path_file) commands.add_file(git_repo_path, version_path_file)
commands.commit_all(git_repo_path, "[RELEASE] Release v" + tools.version_to_string(version_description)) commands.commit_all(git_repo_path, "[RELEASE] Release v" + tools.version_to_string(new_version_description))
commands.tag(git_repo_path, "v" + tools.version_to_string(version_description)) commands.tag(git_repo_path, "v" + tools.version_to_string(new_version_description))
commands.checkout(git_repo_path, source_branch) commands.checkout(git_repo_path, source_branch)
commands.reset_hard(git_repo_path, destination_branch) commands.reset_hard(git_repo_path, destination_branch)
version_description.append("dev") new_version_description.append("dev")
manifest.tag_clear(file_source_manifest); manifest.tag_clear(file_source_manifest);
tools.file_write_data(version_path_file, tools.version_to_string(version_description)) tools.file_write_data(version_path_file, tools.version_to_string(new_version_description))
commands.add_file(git_repo_path, version_path_file) commands.add_file(git_repo_path, version_path_file)
commands.commit_all(git_repo_path, status.default_update_message) commands.commit_all(git_repo_path, status.default_update_message)
commands.checkout(git_repo_path, destination_branch) commands.checkout(git_repo_path, destination_branch)

2
island/actions/status.py
View File

@ -356,6 +356,7 @@ def create_new_version_repo(git_repo_path, version_description, add_in_version_m
version_description.append(version_description_tmp[2]) version_description.append(version_description_tmp[2])
else: else:
version_description.append(0) version_description.append(0)
debug.info("update version: curent: " + str(version_description))
# increment the version # increment the version
if input1 == "1": if input1 == "1":
version_description[0] += 1 version_description[0] += 1
@ -372,6 +373,7 @@ def create_new_version_repo(git_repo_path, version_description, add_in_version_m
else: else:
debug.warning("An error occured for this repository") debug.warning("An error occured for this repository")
return None return None
debug.info("update version: curent: " + str(version_description))
return version_description return version_description