From e008139e1fa5f7396cdd21dbb6ffa7b1a753d7a5 Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Thu, 9 May 2024 14:40:43 -0700 Subject: [PATCH] Build merge tools --- src/python/replay_merge.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/python/replay_merge.py b/src/python/replay_merge.py index 18d968721b..1a590dd919 100755 --- a/src/python/replay_merge.py +++ b/src/python/replay_merge.py @@ -253,13 +253,13 @@ def merge_replay( "--merges_csv", help="CSV file with merges that have been tested", type=str, - default="results/small/result.csv", + default="results/combined/result.csv", ) parser.add_argument( "--idx", help="Index of the merge to replay", type=str, - default="0-1", + default="1-7", ) parser.add_argument( "-test", @@ -276,6 +276,11 @@ def merge_replay( help="Don't check the fingerprint of a merge", action="store_true", ) + parser.add_argument( + "-skip_build", + help="Build the merge tool", + action="store_false", + ) parser.add_argument( "-create_artifacts", help="Create artifacts", @@ -297,6 +302,15 @@ def merge_replay( logger.info("Testing the replay of a merge") if args.create_artifacts: logger.info("Creating artifacts after replaying the merges") + if args.skip_build: + logger.info("Building merge tool") + os.system("cd src/scripts/merge_tools/merging && ./gradlew -q shadowJar") + os.environ["PATH"] = os.environ["PATH"] + os.getcwd() + "/src/scripts/merge_tools/:" + os.environ["PATH"] = ( + os.environ["PATH"] + + os.getcwd() + + "/src/scripts/merge_tools/merging/src/main/sh/" + ) df = pd.read_csv(args.merges_csv, index_col="idx")