Fixed process runner to call from branch folders

Author: marcingrzejszczak

src/main/java/io/micrometer/release/common/ProcessRunner.java

@@ -37,7 +37,7 @@ public class ProcessRunner {
     private final Map<String, String> envVars = new HashMap<>();
 
     public ProcessRunner() {
-        this(null, null);
+        this((String) null, null);
     }
 
     public ProcessRunner(String repo) {
@@ -49,6 +49,17 @@ public ProcessRunner(String repo, File directory) {
         this.directory = directory;
     }
 
+    public ProcessRunner(File directory) {
+        this.repo = null;
+        this.directory = directory;
+    }
+
+    // E.g. Same repo, different branch
+    public ProcessRunner(ProcessRunner processRunner, File directory) {
+        this.repo = processRunner.repo;
+        this.directory = directory;
+    }
+
     public ProcessRunner withEnvVars(Map<String, String> envVars) {
         this.envVars.putAll(envVars);
         return this;

src/main/java/io/micrometer/release/train/DependencyVerifier.java

@@ -71,7 +71,7 @@ void verifyDependencies(String branch, String orgRepository) {
         log.info("Fetching all dependencies before dependabot...");
         Set<Dependency> dependenciesBeforeDependabot = micrometerOnly(gradleParser.fetchAllDependencies());
         Status status = dependabotUpdateStatus(clonedRepo, orgRepository);
-        pullTheLatestRepoChanges();
+        pullTheLatestRepoChanges(clonedRepo);
         Set<Dependency> dependenciesAfterDependabot = micrometerOnly(gradleParser.fetchAllDependencies());
         Set<Dependency> diff = new HashSet<>(dependenciesAfterDependabot);
         diff.removeAll(dependenciesBeforeDependabot);
@@ -111,7 +111,7 @@ private Status dependabotUpdateStatus(File clonedRepo, String orgRepository) {
     }
 
     private GradleParser getGradleParser(File branch) {
-        ProcessRunner branchProcessRunner = new ProcessRunner(null, branch);
+        ProcessRunner branchProcessRunner = new ProcessRunner(branch);
         return gradleParser(branchProcessRunner);
     }
 
@@ -130,9 +130,9 @@ File clonedDir(String branch) {
         return new File(branch);
     }
 
-    private void pullTheLatestRepoChanges() {
+    private void pullTheLatestRepoChanges(File clonedRepo) {
         log.info("Pulling the latest repo changes");
-        processRunner.run("git", "pull");
+        processRunnerForBranch(clonedRepo).run("git", "pull");
     }
 
     private void sleep(int timeoutToSleep) {
@@ -180,12 +180,13 @@ private void triggerDependabotCheck(File clonedRepo) {
                 log.info("Added trigger comment to dependabot.yml");
             }
             Files.writeString(path, fileContent);
-            processRunner.run("git", "config", "user.name", "GitHub Action");
-            processRunner.run("git", "config", "user.email", "[email protected]");
-            processRunner.run("git", "add", filePath);
-            processRunner.run("git", "commit", "-m",
+            ProcessRunner branchProcessRunner = processRunnerForBranch(clonedRepo);
+            branchProcessRunner.run("git", "config", "user.name", "GitHub Action");
+            branchProcessRunner.run("git", "config", "user.email", "[email protected]");
+            branchProcessRunner.run("git", "add", filePath);
+            branchProcessRunner.run("git", "commit", "-m",
                     "ci: " + (hasComment ? "Remove" : "Add") + " dependabot trigger comment");
-            processRunner.run("git", "push");
+            branchProcessRunner.run("git", "push");
         }
         catch (Exception e) {
             log.error("Failed to modify dependabot.yml", e);
@@ -194,6 +195,10 @@ private void triggerDependabotCheck(File clonedRepo) {
         log.info("Triggered Dependabot check");
     }
 
+    ProcessRunner processRunnerForBranch(File clonedRepo) {
+        return new ProcessRunner(this.processRunner, clonedRepo);
+    }
+
     private void waitForDependabotJobsToFinish(String orgRepository, String githubServerTime) {
         log.info("Waiting {} {} for Dependabot jobs to be created...", initialWait, timeUnit);
         sleep(initialWait);

src/test/java/io/micrometer/release/train/DependencyVerifierTests.java

@@ -73,6 +73,11 @@ File clonedDir(String branch) {
                 throw new RuntimeException(e);
             }
         }
+
+        @Override
+        ProcessRunner processRunnerForBranch(File clonedRepo) {
+            return processRunner;
+        }
     };
 
     DependencyVerifierTests() throws URISyntaxException {