Only create file if existing

axonivy · Feb 6, 2025 · 9e0f663 · 9e0f663
1 parent 7782e1a
commit 9e0f663
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/src/main/java/io/ivyteam/devops/github/GitHubSynchronizer.java b/src/main/java/io/ivyteam/devops/github/GitHubSynchronizer.java
@@ -177,12 +177,15 @@ public void synch(GHRepository ghRepo) throws IOException {
     repos.create(repo);
 
     for (var f : List.of("LICENSE", "SECURITY.md", "CODE_OF_CONDUCT.md", "renovate.json", ".github/renovate.json")) {
-      var file = File.create()
-          .repository(repo.name())
-          .path(f)
-          .content(readFile(ghRepo, f))
-          .build();
-      files.create(file);
+      var content = readFile(ghRepo, f);
+      if (content != null && !content.isEmpty()) {
+        var file = File.create()
+            .repository(repo.name())
+            .path(f)
+            .content(content)
+            .build();
+        files.create(file);
+      }
     }
 
     ghRepo.getPullRequests(GHIssueState.OPEN).stream()

diff --git a/src/main/java/io/ivyteam/devops/repo/check/LicenseRepoCheck.java b/src/main/java/io/ivyteam/devops/repo/check/LicenseRepoCheck.java
@@ -25,9 +25,12 @@ public String check(Repo repo) {
       return null;
     }
     var file = files.byPath(repo, "LICENSE");
+    if (file == null) {
+      return "LICENSE file is missing";
+    }
     var content = file.content();
     if (content == null || content.isEmpty()) {
-      return "LICENSE is missing";
+      return "Content of LICENSE file is empty";
     }
     return null;
   }

diff --git a/src/main/java/io/ivyteam/devops/repo/check/RenovateRepoCheck.java b/src/main/java/io/ivyteam/devops/repo/check/RenovateRepoCheck.java
@@ -24,15 +24,18 @@ public String check(Repo repo) {
       return null;
     }
     var renovateFile = files.byPath(repo, "renovate.json");
-    if (renovateFile == null || renovateFile.content() == null || renovateFile.content().isEmpty()) {
+    if (renovateFile == null) {
       renovateFile = files.byPath(repo, ".github/renovate.json");
     }
+    if (renovateFile == null) {
+      return "renovate.json and .github/renovate.json is missing";
+    }
     var content = renovateFile.content();
     if (content == null || content.isEmpty()) {
-      return "renovate.json and .github/renovate.json is missing";
+      return renovateFile.path() + " is empty";
     }
     if (!content.contains(SHARED)) {
-      return "renovate.json does not use shared config '" + SHARED + "'";
+      return renovateFile + " does not use shared config '" + SHARED + "'";
     }
     return null;
   }