Closed Bug 1349813 Opened 4 years ago Closed 4 years ago

Thunderbird 53.0b1 Macosx64 repacks fail

Categories

(Thunderbird :: Build Config, defect)

53 Branch
defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED
Thunderbird 55.0

People

(Reporter: wsmwk, Assigned: Fallen)

Details

Attachments

(1 file, 1 obsolete file)

+++ This bug was initially created as a clone of Bug #1349771 +++

All Mac repacks fail 

m64_rpk_1-000000/comm-beta/obj-l10n/dist/branding/background.png
+ test -n /builds/slave/tb-rel-c-beta-m64_rpk_1-000000/comm-beta/obj-l10n/dist/branding/disk.icns
+ mkdir -p /builds/slave/tb-rel-c-beta-m64_rpk_1-000000/comm-beta/obj-l10n/dist/branding/
+ rsync -a /builds/slave/tb-rel-c-beta-m64_rpk_1-000000/comm-beta/obj-l10n/dist/unpack.tmp/.VolumeIcon.icns /builds/slave/tb-rel-c-beta-m64_rpk_1-000000/comm-beta/obj-l10n/dist/branding/disk.icns
+ rm -rf /builds/slave/tb-rel-c-beta-m64_rpk_1-000000/comm-beta/obj-l10n/dist/unpack.tmp
+ test -n ''
make -C ../../calendar/lightning LOCALE_MERGEDIR=/builds/slave/tb-rel-c-beta-m64_rpk_1-000000/comm-beta/obj-l10n/mail/locales/merged unpack
make[1]: *** No rule to make target `/builds/slave/tb-rel-c-beta-m64_rpk_1-000000/comm-beta/obj-l10n/dist/xpi-stage/lightning-5.5b1.en-US.mac.xpi', needed by `unpack'.  Stop.
make: *** [calendar-unpack] Error 2
command: ERROR
Traceback (most recent call last):
  File "/builds/slave/tb-rel-c-beta-m64_rpk_1-000000/scripts/lib/python/util/commands.py", line 52, in run_cmd
    return subprocess.check_call(cmd, **kwargs)
  File "/tools/python27/lib/python2.7/subprocess.py", line 511, in check_call
    raise CalledProcessError(retcode, cmd)
CalledProcessError: Command '['make', 'installers-ar']' returned non-zero exit status 2
Fallen	wsmwk: yeah, probably something in calendar. Maybe related to some changes Seamonkey did for their downloads
Fallen	it looks like wget-en-US is not being called
Fallen	which should happen at https://dxr.mozilla.org/comm-central/source/mail/locales/Makefile.in#245
Fallen	wsmwk: Also compare to https://archive.mozilla.org/pub/thunderbird/candidates/51.0b1-candidates/build6/logs/release-comm-beta-linux64_repack_9-bm71-build1-build9.txt.gz where the steps are being called
Flags: needinfo?(philipp) → needinfo?(jorgk)
Fallen	seems to me the unpack target is now being done in the calling code instead
Fallen	53.0b1 has a "unpacked-installer" mention
Fallen	hmm actually it may be directories different. Hard to say just by staring at it for 2 mins
Fallen	ok, the wget is usually called afterwards
What's the question?
Flags: needinfo?(jorgk)
Attached patch Fix - v1 β€” β€” Splinter Review
This should fix it. It includes (ported) patches from bug 1329355 and bug 1280683. It seems one of the changes to l10n.mk changes the order that prerequisites are loaded in, so I've also created a target to ensure that the xpi file is available in lightning-packager.mk

The only testing I've done is a makeshift build env for Thunderbird similar to the release repacks, on comm-beta. If you need a try run to land this on other branches I'd appreciate if you could start one.

The im and Seamonkey changes are in the spirit of the above mentioned bugs, but are also untested.
Assignee: nobody → philipp
Status: NEW → ASSIGNED
Attachment #8854009 - Flags: review?(mkmelin+mozilla)
Attachment #8854009 - Flags: review?(ewong)
Attachment #8854009 - Flags: review?(aleth)
Comment on attachment 8854009 [details] [diff] [review]
Fix - v1

Review of attachment 8854009 [details] [diff] [review]:
-----------------------------------------------------------------

Let's try it.
Attachment #8854009 - Flags: review?(mkmelin+mozilla) → review+
Attachment #8854009 - Flags: review?(ewong) → review+
Comment on attachment 8854009 [details] [diff] [review]
Fix - v1

Patrick, can you take over for aleth while he is away?
Attachment #8854009 - Flags: review?(aleth) → review?(clokep)
Attachment #8854009 - Flags: review?(clokep) → review+
https://hg.mozilla.org/comm-central/rev/044ae71333b128ef205049624eb7d113042fc693
I tweaked the commit message and added the e-mail address of the author ;-)

I assumed that this needed to be checked in to C-C with uplift to C-A and C-B, right?

Today is the first day for a while that we have successful repacks on all three platforms on C-C (after bug 1353046 got fixed today). I hope it stays that way ;-)
Status: ASSIGNED → RESOLVED
Closed: 4 years ago
Keywords: checkin-needed
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird 55.0
Comment on attachment 8854009 [details] [diff] [review]
Fix - v1

Yes, needs uplift so we can use this for beta. The changes for bug 1329355 are not in Gecko 53 though.
Attachment #8854009 - Flags: approval-comm-aurora?
Attached patch Patch for beta - v1 (obsolete) β€” β€” Splinter Review
Attachment #8854952 - Flags: review+
Attachment #8854952 - Flags: approval-comm-beta?
Attachment #8854009 - Flags: approval-comm-aurora? → approval-comm-aurora+
Yes, sure. No harm done.
Attachment #8854009 - Flags: approval-comm-beta+
Comment on attachment 8854952 [details] [diff] [review]
Patch for beta - v1

Hastily landed v1 on beta, too, but no harm done.
Attachment #8854952 - Attachment is obsolete: true
Attachment #8854952 - Flags: approval-comm-beta?
You need to log in before you can comment on or make changes to this bug.