Skip to content

Commit

Permalink
merge-day: rename constants.js to constants.sys.js (Bug 1831886)
Browse files Browse the repository at this point in the history
This file was renamed recently and the rename must be reflected in
the merge-day hook to allow `ffxbld-merge` to update the file
programmatically.

--HG--
extra : rebase_source : 17f3b974e6bdf623b3b1f90322e9da78b52b5a83
  • Loading branch information
cgsheeh committed May 8, 2023
1 parent d5a785f commit 6189df7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion hghooks/mozhghooks/check/merge_day.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
b"build/defines.sh",
b"build/mozconfig.common",
b"config/milestone.txt",
b"services/sync/modules/constants.js",
b"services/sync/modules/constants.sys.js",
b"xpcom/components/Module.h",
),
b"thunderbird": (
Expand Down
4 changes: 2 additions & 2 deletions hghooks/tests/test-merge-day.t
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ ffxbld-merge user cannot push non-merge day changes
build/defines.sh
build/mozconfig.common
config/milestone.txt
services/sync/modules/constants.js
services/sync/modules/constants.sys.js
xpcom/components/Module.h

Illegal paths found:
Expand Down Expand Up @@ -86,7 +86,7 @@ ffxbld-merge user cannot push non-merge day changes, multiple
build/defines.sh
build/mozconfig.common
config/milestone.txt
services/sync/modules/constants.js
services/sync/modules/constants.sys.js
xpcom/components/Module.h

Illegal paths found:
Expand Down

0 comments on commit 6189df7

Please sign in to comment.