Skip to content

Commit 637beec

Browse files
committed
Updating deploy script to allow for partial deployments (i.e. if only some of our repos change between releases)
1 parent a0fee0c commit 637beec

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

installer/deploy.py

+12-12
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,12 @@ def main():
106106
release_git_sha = version_info.get('openshot-qt', {}).get('CI_COMMIT_SHA', 'N/A')
107107

108108
# Verify branch names are all the same (across the 3 repos)
109+
# Ignore "develop" branches (since sometimes we have no changes in one or more repos)
109110
original_git_branch = ''
110111
for repo_name in repo_names:
111112
git_branch_name = version_info.get(repo_name, {}).get('CI_COMMIT_REF_NAME')
113+
if git_branch_name == 'develop':
114+
continue
112115
if not original_git_branch:
113116
original_git_branch = git_branch_name
114117
if original_git_branch != git_branch_name:
@@ -128,6 +131,9 @@ def main():
128131
raise Exception("Version cannot contain a '-' character: %s (repo: %s, branch: %s)" %
129132
(github_release_name, repo_name, git_branch_name))
130133

134+
if git_branch_name == 'develop':
135+
output(f"Skipping develop branch for repo: {repo_name}")
136+
continue
131137
if git_branch_name.startswith("release"):
132138
# Get official version release (i.e. v2.1.0, v2.x.x)
133139
releases[repo_name] = get_release(repos.get(repo_name), github_release_name)
@@ -140,10 +146,7 @@ def main():
140146
)
141147
else:
142148
# ignore all branches that don't start with 'release*'
143-
raise Exception(
144-
"%s only allowed for branch names that start with 'release*'"
145-
" (repo: %s, branch: %s)" % (
146-
script_mode, repo_name, git_branch_name))
149+
raise Exception("%s only allowed for branch names that start with 'release*' (repo: %s, branch: %s)" % (script_mode, repo_name, git_branch_name))
147150

148151
if not is_publish:
149152

@@ -167,19 +170,16 @@ def main():
167170
if so_number:
168171
so_title = ", SO: %s" % so_number
169172
log_markdown = "%s Changelog (Version: %s%s)\n---\n%s\n\n" % (
170-
repo_name,
171-
version_info.get(repo_name, {}).get('VERSION'),
172-
so_title,
173-
logs.get(repo_name))
173+
repo_name, version_info.get(repo_name, {}).get('VERSION'), so_title, logs.get(repo_name))
174+
formatted_logs[repo_name] = log_title + log_markdown
174175
combined_log_markdown += log_markdown
175-
if not repo_name == "openshot-qt":
176-
formatted_logs[repo_name] = log_title + log_markdown
177-
formatted_logs["openshot-qt"] = log_title + combined_log_markdown
178176

179177
# Create GitHub Release (if needed)
180178
for repo_name in repo_names:
181-
# If NO release is found, create a new one
182179
git_branch_name = version_info.get(repo_name, {}).get('CI_COMMIT_REF_NAME')
180+
if git_branch_name == 'develop':
181+
continue
182+
# If NO release is found, create a new one
183183
github_release_name = "v%s" % version_info.get(repo_name, {}).get('VERSION')
184184
if not releases.get(repo_name):
185185
# Create a new release if one if missing (for each repo)

0 commit comments

Comments
 (0)