Closed Bug 1578200 Opened 1 year ago Closed 1 year ago

esr68: Cannot bump new fennec specific version files

Categories

(Developer Services :: Mercurial: hg.mozilla.org, task)

task
Not set

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: jlorenzo, Assigned: sheehan)

References

(Blocks 1 open bug)

Details

Attachments

(1 file)

May not be needed anymore once bug 1562629 is implemented.

In bug 1548655, we introduced new version files for Fennec - so we can build nightly, beta, and release off the same tree. In bug 1561617, I modified the mergeday scripts to support these. Mergeday was today and I ran into this issue:

09:29:50     INFO -  remote: **************************** ERROR ****************************
09:29:50     INFO -  remote: ffxbld-merge can only push changes to
09:29:50     INFO -  remote: the following paths:
09:29:50     INFO -  remote: .hgtags
09:29:50     INFO -  remote: CLOBBER
09:29:50     INFO -  remote: browser/config/mozconfigs/
09:29:50     INFO -  remote: browser/config/version.txt
09:29:50     INFO -  remote: browser/config/version_display.txt
09:29:50     INFO -  remote: browser/confvars.sh
09:29:50     INFO -  remote: build/mozconfig.common
09:29:50     INFO -  remote: config/milestone.txt
09:29:50     INFO -  remote: mobile/android/config/mozconfigs/
09:29:50     INFO -  remote: services/sync/modules/constants.js
09:29:50     INFO -  remote: xpcom/components/Module.h
09:29:50     INFO -  remote:
09:29:50     INFO -  remote: Illegal paths found:
09:29:50     INFO -  remote: mobile/android/config/version-files/beta/version.txt
09:29:50     INFO -  remote: mobile/android/config/version-files/beta/version_display.txt
09:29:50     INFO -  remote: mobile/android/config/version-files/nightly/version.txt
09:29:50     INFO -  remote: mobile/android/config/version-files/nightly/version_display.txt
09:29:50     INFO -  remote: mobile/android/config/version-files/release/version.txt
09:29:50     INFO -  remote: mobile/android/config/version-files/release/version_display.txt
09:29:50     INFO -  remote: ***************************************************************

I worked around it by pushing the changes with my personal account[1]. I think the fix is to whitelist these new files.

[1] https://hg.mozilla.org/releases/mozilla-esr68/rev/2d43ffaa9d1adf29b71f0b7354374463c8d7b621

Testing the patch now.

Assignee: nobody → sheehan

During the mergeday on September 2nd, the ffxbld-merge user was unable
to push some new Fennec version files due to these new files being
absent from the merge day hook. This commit adds the new files and
adds them to the test output for the merge script.

Pushed by cosheehan@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/19cec6801077
hghooks/merge_day: whitelist new Fennec version files r=jlorenzo

Status: NEW → RESOLVED
Closed: 1 year ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.