wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1109136 - add upload artifact list to mach_build_properties.json; r=glandium

Browse Source
This commit is contained in:
Mike Shal 2014-12-09 16:35:42 -05:00
parent 9dc7ad0781
commit 71ebf71a67
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/gen_mach_buildprops.py
View File

@ -96,6 +96,9 @@ if __name__ == '__main__':
parser.add_argument("--upload-output", required=True, parser.add_argument("--upload-output", required=True,
action="store", dest="upload_output", action="store", dest="upload_output",
help="Path to the text output of 'make upload'") help="Path to the text output of 'make upload'")
parser.add_argument("--upload-files", required=True, nargs="+",
action="store", dest="upload_files",
help="List of files to be uploaded.")
args = parser.parse_args() args = parser.parse_args()
json_data = getMarProperties(args.complete_mar_file) json_data = getMarProperties(args.complete_mar_file)
@ -112,5 +115,7 @@ if __name__ == '__main__':
# useful for balrog. # useful for balrog.
json_data['partialInfo'] = getPartialInfo(json_data) json_data['partialInfo'] = getPartialInfo(json_data)
json_data['uploadFiles'] = args.upload_files
with open('mach_build_properties.json', 'w') as outfile: with open('mach_build_properties.json', 'w') as outfile:
json.dump(json_data, outfile, indent=4) json.dump(json_data, outfile, indent=4)

6
build/moz-automation.mk
View File

@ -12,6 +12,10 @@ endif
endif endif
include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
include $(topsrcdir)/toolkit/mozapps/installer/upload-files.mk
# Clear out DIST_FILES if it was set by upload-files.mk (for Android builds)
DIST_FILES =
# Log file from the 'make upload' step. We need this to parse out the URLs of # Log file from the 'make upload' step. We need this to parse out the URLs of
# the uploaded files. # the uploaded files.
@ -86,7 +90,7 @@ automation/l10n-check: automation/pretty-l10n-check
automation/update-packaging: automation/pretty-update-packaging automation/update-packaging: automation/pretty-update-packaging
automation/build: $(addprefix automation/,$(MOZ_AUTOMATION_TIERS)) automation/build: $(addprefix automation/,$(MOZ_AUTOMATION_TIERS))
$(PYTHON) $(topsrcdir)/build/gen_mach_buildprops.py --complete-mar-file $(DIST)/$(COMPLETE_MAR) $(addprefix --partial-mar-file ,$(wildcard $(DIST)/$(PARTIAL_MAR))) --upload-output $(AUTOMATION_UPLOAD_OUTPUT) $(PYTHON) $(topsrcdir)/build/gen_mach_buildprops.py --complete-mar-file $(DIST)/$(COMPLETE_MAR) $(addprefix --partial-mar-file ,$(wildcard $(DIST)/$(PARTIAL_MAR))) --upload-output $(AUTOMATION_UPLOAD_OUTPUT) --upload-files $(abspath $(UPLOAD_FILES))
# We need the log from make upload to grep it for urls in order to set # We need the log from make upload to grep it for urls in order to set
# properties. # properties.