diff --git a/seed/fieldtrials_testing_config_generator.py b/seed/fieldtrials_testing_config_generator.py index 50bc9053..cdc8beda 100644 --- a/seed/fieldtrials_testing_config_generator.py +++ b/seed/fieldtrials_testing_config_generator.py @@ -49,10 +49,12 @@ NPM_EXECUTABLE = 'npm.cmd' if sys.platform == 'win32' else 'npm' def _get_variations_revision(date: str, branch: str) -> str: - args = ['git', 'rev-list', '-n', '1', '--first-parent'] + # fetch the branch: + subprocess.check_call(['git', 'fetch', 'origin', branch]) + + args = ['git', 'rev-list', 'FETCH_HEAD', '-n', '1', '--first-parent'] if date: args.append(f'--before={date}') - args.append(branch) output = subprocess.check_output(args) return output.rstrip().decode('utf-8') @@ -205,14 +207,16 @@ def main(): target_unix_time = date.timestamp() if args.use_current_branch: - branch = 'HEAD' - elif date < PRODUCTION_BRANCH_MIGRATION_DATE: - branch = 'origin/production-archive' + revision = 'HEAD' + print('Load seed from HEAD') else: - branch = 'origin/main' + if date < PRODUCTION_BRANCH_MIGRATION_DATE: + branch = 'production-archive' + else: + branch = 'main' + revision = _get_variations_revision(args.target_date, branch) + print('Load seed at', revision, 'from branch', branch) - revision = _get_variations_revision(args.target_date, branch) - print('Load seed at', revision, 'from branch', branch) seed_message = _get_variations_seed(revision) if args.output_revision is not None: