Skip to content

Commit

Permalink
Build merge tools
Browse files Browse the repository at this point in the history
  • Loading branch information
Benedikt Schesch committed May 9, 2024
1 parent edf5dd7 commit e008139
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions src/python/replay_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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")

Expand Down

0 comments on commit e008139

Please sign in to comment.