341089 - Windows Lightning builds are uploaded to linux-xpi directory instead of windows-xpi

Status: RESOLVED FIXED

(Webtools Graveyard :: Tinderbox, defect)

Description

[Stefan Sitter [:ssitter]]

The windows Lightning builds (trunk and mozilla1.8) on Solaria tinderbox are uploaded to wrong directory since 2006-06-08. The resulting lightning.xpi file is uploaded to linux-xpi/lightning.xpi instead of windows-xpi/lightning.xpi.


From todays build log:

rsync -av -e ssh -2 /cygdrive/c/builds/tinderbox/Lt-Mozilla1.8/WINNT_5.2_Depend/2006061006/packages/ [e-mail]:/home/ftp/pub/calendar/lightning/nightly/2006-06-10-06-mozilla1.8/
building file list ... done
./
thunderbird-2.0a1.en-US.win32.zip
linux-xpi/
linux-xpi/lightning.xpi

ssh -2 -l cltbld stage.mozilla.org rsync -avz /home/ftp/pub/calendar/lightning/nightly/2006-06-10-06-mozilla1.8/ /home/ftp/pub/calendar/lightning/nightly/latest-mozilla1.8/
building file list ... done
./
thunderbird-2.0a1.en-US.win32.zip
linux-xpi/
linux-xpi/lightning.xpi


Expected results:
Files are uploaded to windows-xpi directory.

Comment 1

[Stefan Sitter [:ssitter]]

I checked the trunk build logs in case this is caused by a cvs check in:

WORKS: WINNT 5.2 solaria Depend Lt-Release on 2006-06-08 08:39:00
FAILS: WINNT 5.2 solaria Depend Lt-Release on 2006-06-08 14:43:00

http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=all&branch=HEAD&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=explicit&mindate=2006-06-08+08%3A38%3A00&maxdate=2006-06-08+14%3A44%3A00&cvsroot=%2Fcvsroot

Comment 2

[Dan Mosedale (:dmosedale, :dmose)]

This has the bad consequence that only one of linux and windows nightlies are available on any given day.

Comment 3

[Stefan Sitter [:ssitter]]

Same problem with new tinderbox: WINNT 5.2 sb-win32-tbox Dep Lt-Nightly.

Comment 4

[J. Paul Reed [:preed]]

Attachment: Detect the different Win32/Linux cases

In investigating this, it looks like the lightning xpi first built on Linux, and when the win32 xpi was added, that case wasn't taken into account (see bug 321244).

This should handle the linux/win32 case, and ignore any future cases (mac), so they'll have to be explicitely added, but won't clobber things.

Comment 5

[Dan Mosedale (:dmosedale, :dmose)]

Comment on attachment 226850 [details] [diff] [review]
Detect the different Win32/Linux cases

Thanks!  r=dmose, and if you want to add the relevant mac clause now, r=dmose  on that too.

Comment 6

[J. Paul Reed [:preed]]

(In reply to comment #5)
> (From update of attachment 226850 [details] [diff] [review] [edit])
> Thanks!  r=dmose, and if you want to add the relevant mac clause now, r=dmose 
> on that too.  

I can add the mac clause if there's an xpi being built for mac; is there?

Comment 7

[Matthew (lilmatt) Willis]

(In reply to comment #6)
> I can add the mac clause if there's an xpi being built for mac; is there?

Lightning? Yes. It's built by hilo.