Skip to content

The Unified and Autonomous Development Platform

chore: Fix some migration error

Robin Shen875deb225c99
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
index 5cc802f846..3320a2a306 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
@@ -2544,7 +2544,7 @@ public class BuildSpec implements Serializable, Validatable {
}
pos = end + 1;
}
- keyNode.setValue(sb.toString());
+ keyNode.setValue(StringUtils.stripEnd(sb.toString(), ":-_."));
} else if (propName.equals("loadKeys")) {
itStepTuple.remove();
} else if (propName.equals("uploadStrategy")) {
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index bd3fdb6902..730804309c 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -8545,32 +8545,6 @@ public class DataMigrator {
throw new RuntimeException(e);
}
- for (File file : dataDir.listFiles()) {
- if (file.getName().startsWith("JobCaches.xml")) {
- File renamedFile = new File(dataDir, file.getName().replace("JobCaches.xml", "RunCaches.xml"));
- try {
- FileUtils.moveFile(file, renamedFile);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- }
- for (File file : dataDir.listFiles()) {
- if (file.isFile()) {
- try {
- String content = FileUtils.readFileToString(file, UTF_8.name());
- if (content.contains("io.onedev.server.model.JobCache")) {
- content = StringUtils.replace(content,
- "io.onedev.server.model.JobCache",
- "io.onedev.server.model.RunCache");
- FileUtils.writeFile(file, content, UTF_8);
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- }
-
for (File file : dataDir.listFiles()) {
if (file.getName().startsWith("Projects.xml")) {
VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalWorkspaceSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalWorkspaceSetting.java
index 458aac47e7..3a6393b5ab 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalWorkspaceSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalWorkspaceSetting.java
@@ -19,10 +19,11 @@ public class GlobalWorkspaceSetting implements Serializable {
public GlobalWorkspaceSetting() {
namedQueries.add(new NamedWorkspaceQuery("All", null));
- namedQueries.add(new NamedWorkspaceQuery("Queueing", "queueing"));
- namedQueries.add(new NamedWorkspaceQuery("Started", "started"));
- namedQueries.add(new NamedWorkspaceQuery("Stopped", "stopped"));
+ namedQueries.add(new NamedWorkspaceQuery("Pending", "pending"));
+ namedQueries.add(new NamedWorkspaceQuery("Active", "active"));
+ namedQueries.add(new NamedWorkspaceQuery("In Error", "error"));
namedQueries.add(new NamedWorkspaceQuery("Created by me", "created by me"));
+ namedQueries.add(new NamedWorkspaceQuery("Created recently", "\"Create Date\" is since \"last week\""));
}
@Valid
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 5c1ed062d5..b828832dca 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -21,7 +21,7 @@ public class TestPage extends BasePage {
add(new Link<Void>("test") {
@Override
- public void onClick() {
+ public void onClick() {
}
});
diff --git a/server-ee b/server-ee
index daf8dce5bb..e6d9e4d240 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit daf8dce5bb8fc729ab7314235fe0b3317819643a
+Subproject commit e6d9e4d240f0d5e77b56acd4b061a18900c7a8d9