Closed Bug 1468204 Opened Last year Closed Last year

remove references to ubuntu 12.04 in manifest files as it is a platform we don't runtests on anymore

Categories

(Testing :: General, enhancement)

enhancement
Not set

Tracking

(firefox62 fixed)

RESOLVED FIXED
mozilla62
Tracking Status
firefox62 --- fixed

People

(Reporter: jmaher, Assigned: ebalazs_)

References

Details

Attachments

(1 file)

there are 52 instances (in 15 manifests) in this query:
https://searchfox.org/mozilla-central/search?q=12.04&path=*.ini

please include these in a single patch.
Assignee: nobody → ebalazs
Comment on attachment 8985139 [details] [diff] [review]
Removed ubuntu12.04 reference from manifest files

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

there is another patch that removes the windows 8 references in some of the same files, so there might be a conflict in landing this or when that other patch lands.
Attachment #8985139 - Flags: review?(jmaher) → review+
I get the following conflict:
(working directory not at a head)
applying bug1468204.patch
cleaning up working directory...
reverting testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.pattern.image.broken.html.ini
reverting testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_1.html.ini
reverting testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1.html.ini
reverting testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_write_onload_2.html.ini
reverting testing/web-platform/meta/html/editing/focus/focus-management/focus-events.html.ini
reverting testing/web-platform/meta/resource-timing/resource_connection_reuse.html.ini
reverting testing/web-platform/meta/webgl/bufferSubData.html.ini
reverting testing/web-platform/meta/webgl/compressedTexImage2D.html.ini
reverting testing/web-platform/meta/webgl/compressedTexSubImage2D.html.ini
reverting testing/web-platform/meta/webgl/texImage2D.html.ini
reverting testing/web-platform/meta/webgl/texSubImage2D.html.ini
reverting testing/web-platform/meta/webgl/uniformMatrixNfv.html.ini
reverting testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size_while_paused.html.ini
reverting testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_line.html.ini
reverting testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text.html.ini
done
abort: qpush exactly duplicates child changeset
What is the best option to resolve this conflict? Thank you.
Flags: needinfo?(jmaher)
I assume there is a need to manually correct the changes where the conflict occurs.  Typically there is a .rej file which shows what didn't apply.

this message |(working directory not at a head)| is suspect of a potential problem.
Flags: needinfo?(jmaher)
Pushed by ebalazs@mozilla.com:
https://hg.mozilla.org/integration/mozilla-inbound/rev/85ff6d02c6a7
removed reference to ubuntu 12.04 in manifest files. r=jmaher
https://hg.mozilla.org/mozilla-central/rev/85ff6d02c6a7
Status: NEW → RESOLVED
Closed: Last year
Resolution: --- → FIXED
Target Milestone: --- → mozilla62
You need to log in before you can comment on or make changes to this bug.