[wpt-sync] Sync PR 16066 - Don't use HEAD or FETCH_HEAD to checkout specific revisions.

RESOLVED FIXED in Firefox 68

Status

enhancement
P4
normal
RESOLVED FIXED
5 months ago
4 months ago

People

(Reporter: wptsync, Unassigned)

Tracking

unspecified
mozilla68
Points:
---

Firefox Tracking Flags

(firefox68 fixed)

Details

(Whiteboard: [wptsync downstream], )

Sync web-platform-tests PR 16066 into mozilla-central (this bug is closed when the sync is complete).

PR: https://github.com/web-platform-tests/wpt/pull/16066
Details from upstream follow.

James Graham <james@hoppipolla.co.uk> wrote:

Don't use HEAD or FETCH_HEAD to checkout specific revisions.

FETCH_HEAD is unreliable because it's a global variable that can be
accidentially clobbered by adding an additional fetch anywhere in the
pipeline. As a result running tests in CI has been broken since we
chose the wrong revisions. HEAD is more reliable but doesn't exist
until we first check something out.

Instead, do the following:

  • Fetch the initial commits into a branch called task_head and check
    this out unconditionally.

  • For PRs, create branches called base_head and pr_head pointing to
    the two parents of the merge commit that we test on PRs.

  • Express all the other revisions in terms of task_head, pr_head and
    base_head, since they are both correct and more descriptive than
    using complex revision specifiers.

  • Move as much logic as possible out of the script baked in to the
    docker image since that's hardest to update.

Whiteboard: [wptsync downstream] → [wptsync downstream error]
PR 16066 applied with additional changes from upstream: 6a2b8ebad7aeec36e693a03e60d6ce239eb74956, 53e263d0d8297a02390d56c3d8f75ee82544780d, cc9980226202699835703082cdd4ccf62be91f8a, e9e3f11de7472be4bd71d45d96f434872fd3f974, a007c4be0a1daeb48dcd6d6ded3a39dc9015244d, 967e4dd2487bf4c9d0db425f8eaf6d6e969be258, 48070156dd14700631d4b713f8715e1477c31e95
Whiteboard: [wptsync downstream error] → [wptsync downstream]
Pushed by james@hoppipolla.co.uk:
https://hg.mozilla.org/integration/mozilla-inbound/rev/9980646b6dd4
[wpt PR 16066] - Don't use HEAD or FETCH_HEAD to checkout specific revisions., a=testonly
Pushed by james@hoppipolla.co.uk:
https://hg.mozilla.org/integration/mozilla-inbound/rev/55479946bf64
[wpt PR 16066] - Don't use HEAD or FETCH_HEAD to checkout specific revisions., a=testonly
Status: NEW → RESOLVED
Closed: 4 months ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla68
You need to log in before you can comment on or make changes to this bug.