From d19803869c90d318b2f0bacd88109a756edc3b97 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Sat, 4 May 2024 22:14:58 -0700
Subject: [PATCH 1/4] Remove duplication

---
 src/python/replay_merge.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/python/replay_merge.py b/src/python/replay_merge.py
index 1a0d6bab44..2b0b4d7cd5 100755
--- a/src/python/replay_merge.py
+++ b/src/python/replay_merge.py
@@ -239,12 +239,6 @@ def merge_replay(
         + os.getcwd()
         + "/src/scripts/merge_tools/merging/src/main/sh/"
     )
-    parser.add_argument(
-        "-create_artifacts",
-        help="Create artifacts",
-        action="store_true",
-    )
-    args = parser.parse_args()
 
     df = pd.read_csv(args.merges_csv, index_col="idx")
 

From d1cf13d035d137ecfe80f1e45987fc47a9601f71 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Sat, 4 May 2024 22:18:31 -0700
Subject: [PATCH 2/4] Fix name

---
 .github/workflows/test-replay.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-replay.yml b/.github/workflows/test-replay.yml
index 28ee4367b9..d2fc8efbbb 100644
--- a/.github/workflows/test-replay.yml
+++ b/.github/workflows/test-replay.yml
@@ -1,4 +1,4 @@
-name: Run Small test
+name: Test replay_merge.sh
 on: [push, pull_request]
 jobs:
   test:
@@ -54,7 +54,7 @@ jobs:
     - name: Clean caches & workspace
       run: make clean
     - run: echo "LOGURU_COLORIZE=NO" >> $GITHUB_ENV
-    - name: Run small test
+    - name: Run replay_merge.sh
       run: |
         git config --global user.email "example@example.com"
         git config --global user.name "Example Example"

From 4ef36302f25bcf456559e333012daac80fd22674 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Sat, 4 May 2024 22:26:38 -0700
Subject: [PATCH 3/4] Update actions/setup-java

---
 .github/workflows/small-test.yml  | 6 +++---
 .github/workflows/test-replay.yml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/small-test.yml b/.github/workflows/small-test.yml
index 3300f54ee5..febdff45eb 100644
--- a/.github/workflows/small-test.yml
+++ b/.github/workflows/small-test.yml
@@ -10,19 +10,19 @@ jobs:
       run:
         shell: bash -l {0}
     steps:
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: 8
     - run: echo "JAVA8_HOME=$JAVA_HOME" >> $GITHUB_ENV
     - run: java -version
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: 11
     - run: echo "JAVA11_HOME=$JAVA_HOME" >> $GITHUB_ENV
     - run: java -version
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: 17
diff --git a/.github/workflows/test-replay.yml b/.github/workflows/test-replay.yml
index d2fc8efbbb..b214675c32 100644
--- a/.github/workflows/test-replay.yml
+++ b/.github/workflows/test-replay.yml
@@ -10,19 +10,19 @@ jobs:
       run:
         shell: bash -l {0}
     steps:
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: 8
     - run: echo "JAVA8_HOME=$JAVA_HOME" >> $GITHUB_ENV
     - run: java -version
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: 11
     - run: echo "JAVA11_HOME=$JAVA_HOME" >> $GITHUB_ENV
     - run: java -version
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: 17

From 0fc1a7fdd9034a9551313cc98af89ab492f82d9f Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Sat, 4 May 2024 22:51:11 -0700
Subject: [PATCH 4/4] Update actions/setup-java to v4 (#287)

---
 .github/workflows/small-test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/small-test.yml b/.github/workflows/small-test.yml
index 3300f54ee5..febdff45eb 100644
--- a/.github/workflows/small-test.yml
+++ b/.github/workflows/small-test.yml
@@ -10,19 +10,19 @@ jobs:
       run:
         shell: bash -l {0}
     steps:
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: 8
     - run: echo "JAVA8_HOME=$JAVA_HOME" >> $GITHUB_ENV
     - run: java -version
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: 11
     - run: echo "JAVA11_HOME=$JAVA_HOME" >> $GITHUB_ENV
     - run: java -version
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: 17