Skip to content

Commit

Permalink
Bug 1833234 - update fast-forward example config for v112. r=ng DONTB…
Browse files Browse the repository at this point in the history
  • Loading branch information
mfromanmoz committed May 15, 2023
1 parent b4d2bd2 commit 645018d
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions dom/media/webrtc/third_party_build/example_config_env
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,34 @@ export MOZ_LIBWEBRTC_SRC=$STATE_DIR/moz-libwebrtc
# the commit summary as each upstream commit is vendored into the
# mercurial repository. The bug used for the v106 fast-forward was
# 1800920.
export MOZ_FASTFORWARD_BUG="1828517"
export MOZ_FASTFORWARD_BUG="1833237"

# MOZ_NEXT_LIBWEBRTC_MILESTONE and MOZ_NEXT_FIREFOX_REL_TARGET are
# not used during fast-forward processing, but facilitate generating this
# example config. To generate an example config for the next update, run
# bash dom/media/webrtc/third_party_build/update_example_config_env.sh
export MOZ_NEXT_LIBWEBRTC_MILESTONE=111
export MOZ_NEXT_FIREFOX_REL_TARGET=115
export MOZ_NEXT_LIBWEBRTC_MILESTONE=112
export MOZ_NEXT_FIREFOX_REL_TARGET=116

# For Chromium release branches, see:
# https://chromiumdash.appspot.com/branches

# Chromium's v110 release branch was 5481. This is used to pre-stack
# Chromium's v111 release branch was 5563. This is used to pre-stack
# the previous release branch's commits onto the appropriate base commit
# (the first common commit between trunk and the release branch).
export MOZ_PRIOR_UPSTREAM_BRANCH_HEAD_NUM="5481"
export MOZ_PRIOR_UPSTREAM_BRANCH_HEAD_NUM="5563"

# New target release branch for v111 is branch-heads/5563. This is used
# New target release branch for v112 is branch-heads/5615. This is used
# to calculate the next upstream commit.
export MOZ_TARGET_UPSTREAM_BRANCH_HEAD="branch-heads/5563"
export MOZ_TARGET_UPSTREAM_BRANCH_HEAD="branch-heads/5615"

# For local development 'mozpatches' is fine for a branch name, but when
# pushing the patch stack to github, it should be named something like
# 'moz-mods-chr111-for-rel115'.
# 'moz-mods-chr112-for-rel116'.
export MOZ_LIBWEBRTC_BRANCH="mozpatches"

# After elm has been merged to mozilla-central, the patch stack in
# moz-libwebrtc should be pushed to github. The script
# push_official_branch.sh uses this branch name when pushing to the
# public repo.
export MOZ_LIBWEBRTC_OFFICIAL_BRANCH="moz-mods-chr111-for-rel115"
export MOZ_LIBWEBRTC_OFFICIAL_BRANCH="moz-mods-chr112-for-rel116"

0 comments on commit 645018d

Please sign in to comment.