Commit ed04a950 authored by Michael Froman's avatar Michael Froman
Browse files

Bug 1828733 - change example_config_env to default_config_env. r=ng DONTBUILD

parent 428f3fa0
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -13,5 +13,5 @@ process, go to the
In most cases, the scripts report errors including suggestions on how to resolve the
issue.  If you're seeing an error message referring you to this README.md file, the
likely issue is that you're missing environment variables that should be set in a
config_env file in your root directory.  An example of that file can be found at
[dom/media/webrtc/third_party_build/example_config_env](https://searchfox.org/mozilla-central/rev/ef0aa879e94534ffd067a3748d034540a9fc10b0/dom/media/webrtc/third_party_build/example_config_env).
config_env file in .moz-fast-forward.  The default for that file can be found at
dom/media/webrtc/third_party_build/default_config_env.
+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 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
# default config.  To generate an default config for the next update, run
# bash dom/media/webrtc/third_party_build/update_default_config_env.sh
export MOZ_NEXT_LIBWEBRTC_MILESTONE=112
export MOZ_NEXT_FIREFOX_REL_TARGET=116

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ set -eEuo pipefail
rm -f $STATE_DIR/resume_state

# If there is no cache file for the branch-head lookups done in
# update_example_config.sh, go ahead and copy our small pre-warmed
# update_default_config.sh, go ahead and copy our small pre-warmed
# version.
if [ ! -f $STATE_DIR/milestone.cache ]; then
  cp $SCRIPT_DIR/pre-warmed-milestone.cache $STATE_DIR/milestone.cache
+3 −3
Original line number Diff line number Diff line
@@ -37,10 +37,10 @@ fi
set -eEuo pipefail

ERROR_HELP=$"
An error has occurred running $SCRIPT_DIR/write_example_config.py
An error has occurred running $SCRIPT_DIR/write_default_config.py
"
./mach python $SCRIPT_DIR/write_example_config.py \
./mach python $SCRIPT_DIR/write_default_config.py \
  --bug-number $NEW_BUG_NUMBER \
  --milestone $MOZ_NEXT_LIBWEBRTC_MILESTONE \
  --release-target $MOZ_NEXT_FIREFOX_REL_TARGET \
  > $SCRIPT_DIR/example_config_env
  > $SCRIPT_DIR/default_config_env
+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ fi

if [ ! -f $MOZ_CONFIG_PATH ]; then
  echo "Creating default config file at $MOZ_CONFIG_PATH"
  cp $SCRIPT_DIR/example_config_env $MOZ_CONFIG_PATH
  cp $SCRIPT_DIR/default_config_env $MOZ_CONFIG_PATH
fi
source $MOZ_CONFIG_PATH

Loading