1246872 - Fix bundle name for OS X artifact builds from trees other than inbound or fx-team

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Chris Manchester (limited bugmail, email directly)]

Right now the source bundle dir is hardcoded to 'Nightly.app', but this doesn't match artifacts coming from central: they will be 'FirefoxNightly.app'.

Comment 1

[Chris Manchester (limited bugmail, email directly)]

Attachment: MozReview Request: Bug 1246872 - Find the source bundle directory by pattern matching for OS X artifact builds. r=nalexander

Review commit: https://reviewboard.mozilla.org/r/34139/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/34139/

Comment 2

[Nick Alexander :nalexander [he/him]]

Comment on attachment 8717328 [details]
MozReview Request: Bug 1246872 - Find the source bundle directory by pattern matching for OS X artifact builds. r=nalexander

https://reviewboard.mozilla.org/r/34139/#review30869

I'm fine with this.  I see from the ticket that the idea is to allow taking a `NightlyDebug.app` and similar?  Can you update the commit message to say that?

::: python/mozbuild/mozbuild/artifacts.py:265
(Diff revision 1)
> -            # TODO: Extract the bundle name from the archive (it may differ
> +            bundle_dirs = glob.glob(mozpath.join(tempdir, '*.app'))

Prefer to use the `FileFinder` APIs.

Comment 3

[Chris Manchester (limited bugmail, email directly)]

https://reviewboard.mozilla.org/r/34139/#review30869

> Prefer to use the `FileFinder` APIs.

I'm finding that the '*.app' pattern matches every file in the bundle when I use it as a mozpath pattern.

Comment 4

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/af565d48561c

Comment 5

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/af565d48561c