The Unified and Autonomous Development Platform
Prefix build category directory with 's' to differenticate with normal build directories
Robin Shene0795eea8539
diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.javaindex 13cd79f1f5..691f55e9fa 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java@@ -13,17 +13,16 @@ import io.onedev.server.migration.MigrationHelper;import io.onedev.server.persistence.HibernateConfig;import io.onedev.server.security.SecurityUtils;import org.apache.commons.lang3.SystemUtils;+import org.apache.commons.lang3.math.NumberUtils;import org.joda.time.DateTime;import org.joda.time.format.DateTimeFormat;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import javax.annotation.Nullable;import javax.inject.Singleton;import java.io.File;import java.io.IOException;import java.nio.charset.Charset;-import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.List;import java.util.Properties;@@ -712,18 +711,15 @@ public class Upgrade extends AbstractPlugin {var buildsDir = new File(projectDir, "builds");if (buildsDir.exists()) {for (var buildDir: buildsDir.listFiles()) {- if (buildDir.getName().equals(directoryVersion))+ if (!NumberUtils.isDigits(buildDir.getName()))continue;- if (new File(buildDir, "build.log").exists()- || new File(buildDir, "artifacts").exists()) {- var buildNumber = Integer.parseInt(buildDir.getName());- File suffixDir = new File(buildsDir, String.format("%03d", buildNumber%1000));- FileUtils.createDir(suffixDir);- try {- FileUtils.moveDirectory(buildDir, new File(suffixDir, String.valueOf(buildNumber)));- } catch (IOException e) {- throw new RuntimeException(e);- }+ var buildNumber = Integer.parseInt(buildDir.getName());+ File suffixDir = new File(buildsDir, String.format("s%03d", buildNumber%1000));+ FileUtils.createDir(suffixDir);+ try {+ FileUtils.moveDirectory(buildDir, new File(suffixDir, String.valueOf(buildNumber)));+ } catch (IOException e) {+ throw new RuntimeException(e);}}}diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 9b1cd54e84..ab95194788 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -192,7 +192,7 @@ public class Build extends ProjectBelonging}public static String getStoragePath(Long buildNumber) {- return String.format("%03d", buildNumber%1000) + "/" + buildNumber;+ return String.format("s%03d", buildNumber%1000) + "/" + buildNumber;}public File getLogFile() {