@@ -106,9 +106,12 @@ def main():
106
106
release_git_sha = version_info .get ('openshot-qt' , {}).get ('CI_COMMIT_SHA' , 'N/A' )
107
107
108
108
# 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)
109
110
original_git_branch = ''
110
111
for repo_name in repo_names :
111
112
git_branch_name = version_info .get (repo_name , {}).get ('CI_COMMIT_REF_NAME' )
113
+ if git_branch_name == 'develop' :
114
+ continue
112
115
if not original_git_branch :
113
116
original_git_branch = git_branch_name
114
117
if original_git_branch != git_branch_name :
@@ -128,6 +131,9 @@ def main():
128
131
raise Exception ("Version cannot contain a '-' character: %s (repo: %s, branch: %s)" %
129
132
(github_release_name , repo_name , git_branch_name ))
130
133
134
+ if git_branch_name == 'develop' :
135
+ output (f"Skipping develop branch for repo: { repo_name } " )
136
+ continue
131
137
if git_branch_name .startswith ("release" ):
132
138
# Get official version release (i.e. v2.1.0, v2.x.x)
133
139
releases [repo_name ] = get_release (repos .get (repo_name ), github_release_name )
@@ -140,10 +146,7 @@ def main():
140
146
)
141
147
else :
142
148
# 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 ))
147
150
148
151
if not is_publish :
149
152
@@ -167,19 +170,16 @@ def main():
167
170
if so_number :
168
171
so_title = ", SO: %s" % so_number
169
172
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
174
175
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
178
176
179
177
# Create GitHub Release (if needed)
180
178
for repo_name in repo_names :
181
- # If NO release is found, create a new one
182
179
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
183
183
github_release_name = "v%s" % version_info .get (repo_name , {}).get ('VERSION' )
184
184
if not releases .get (repo_name ):
185
185
# Create a new release if one if missing (for each repo)
0 commit comments