Bug 1153799 - Stop using SSH symbol upload when using Socorro API. r=gps, a=NPOTB
authorTed Mielczarek <ted@mielczarek.org>
Fri, 24 Apr 2015 06:41:56 -0400
changeset 238546 3a29810abb960069c944ce4acf1873de85b86620
parent 238545 aaf3655782450b84dc98eaaae511ba18d3ef1d27
child 238547 6212532a6bdb2c9feb644ede1bc7e02a07c172a9
push id667
push userryanvm@gmail.com
push dateMon, 01 Jun 2015 19:48:18 +0000
treeherdermozilla-b2g37_v2_2@c163c2a5b921 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps, NPOTB
bugs1153799
milestone37.0
Bug 1153799 - Stop using SSH symbol upload when using Socorro API. r=gps, a=NPOTB
Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -246,18 +246,19 @@ ifdef MOZ_CRASHREPORTER
 	cd $(DIST)/crashreporter-symbols && \
           zip -r9D '../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip' . -i '*.sym' -i '*.txt'  -x '*test*' -x '*Test*'
 endif # MOZ_CRASHREPORTER
 
 uploadsymbols:
 ifdef MOZ_CRASHREPORTER
 ifdef SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE
 	$(PYTHON) $(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.py '$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip'
+else
+	$(SHELL) $(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.sh $(SYMBOL_INDEX_NAME) '$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip'
 endif
-	$(SHELL) $(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.sh $(SYMBOL_INDEX_NAME) '$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip'
 endif
 
 # MOZ_SOURCE_STAMP is defined in package-name.mk with a deferred assignment.
 # exporting it makes make run its $(shell) command for each invoked submake,
 # so transform it to an immediate assignment.
 MOZ_SOURCE_STAMP := $(MOZ_SOURCE_STAMP)
 export MOZ_SOURCE_STAMP
 endif