Skip to content

Commit 53c9029

Browse files
authored
Gitlab builders: work around github3 API differences (#4109)
1 parent e8e53cf commit 53c9029

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

installer/build_server.py

+13-3
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,17 @@ def upload(file_path, github_release):
170170

171171
# Delete any matching assets already in this github release
172172
# so we don't have any collisions.
173-
for asset in github_release.assets:
173+
if hasattr(github_release, 'original_assets'):
174+
asset_list = github_release.original_assets
175+
else:
176+
asset_list = github_release.assets
177+
for asset in asset_list:
174178
if asset.name == file_name:
175179
output("GitHub: Removing conflicting installer asset from %s: %s" % (github_release.tag_name, file_name))
176-
asset._delete(asset._api)
180+
if hasattr(asset, 'delete'):
181+
asset.delete()
182+
else:
183+
asset._delete(asset._api)
177184
break
178185

179186
for attempt in range(3):
@@ -183,7 +190,10 @@ def upload(file_path, github_release):
183190
# Upload to GitHub
184191
output("GitHub: Uploading asset from %s: %s" % (github_release.tag_name, file_name))
185192
asset = github_release.upload_asset("application/octet-stream", file_name, f)
186-
url = asset.to_json()["browser_download_url"]
193+
if hasattr(asset, 'browser_download_url'):
194+
url = asset.browser_download_url
195+
else:
196+
url = asset.to_json()["browser_download_url"]
187197
# Successfully uploaded!
188198
break
189199
except Exception as ex:

0 commit comments

Comments
 (0)