Skip to content

The Unified and Autonomous Development Platform

Some minor improvements and bug fixes

Robin Shenb98cabff993b
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntryEx.java b/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntryEx.java
index aff9b8c37e..465f64a219 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntryEx.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntryEx.java
@@ -1,5 +1,11 @@
package io.onedev.server.buildspec.job.log;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
+import io.onedev.server.job.log.StyleBuilder;
+import io.onedev.server.web.asset.emoji.Emojis;
+
+import javax.annotation.Nullable;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
@@ -8,14 +14,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.BiFunction;
import java.util.function.Function;
-import javax.annotation.Nullable;
-
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
-
-import io.onedev.server.job.log.StyleBuilder;
-import io.onedev.server.web.asset.emoji.Emojis;
-
public class JobLogEntryEx implements Serializable {
private static final long serialVersionUID = 1L;
@@ -48,161 +46,163 @@ public class JobLogEntryEx implements Serializable {
AtomicInteger cursor = new AtomicInteger(0);
List<Message> messages = new ArrayList<>();
- Function<String, Void> textAppender = new Function<String, Void>() {
+ Function<String, Void> textAppender = new Function<>() {
@Override
public Void apply(String text) {
- if (cursor.get() < 0)
- cursor.set(0);
- List<Message> copy = new ArrayList<>(messages);
- messages.clear();
- int index = 0;
- for (Message message: copy) {
- String currentText = message.getText();
- if (cursor.get() >= index + currentText.length()) {
- messages.add(message);
- } else {
- if (cursor.get() > index) {
- String beforeText = currentText.substring(0, cursor.get()-index);
- messages.add(new Message(message.getStyle(), beforeText));
- }
- if (cursor.get() >= index)
- messages.add(new Message(styleBuilder.build(), text));
- if (cursor.get() + text.length() < index) {
- messages.add(message);
- } else if (cursor.get() + text.length() < index + currentText.length()) {
- String afterText = currentText.substring(cursor.get()+text.length()-index, currentText.length());
- messages.add(new Message(message.getStyle(), afterText));
- }
- }
- index += currentText.length();
- }
+ if (cursor.get() < 0)
+ cursor.set(0);
+ List<Message> copy = new ArrayList<>(messages);
+ messages.clear();
+ int index = 0;
+ for (Message message : copy) {
+ String currentText = message.getText();
+ if (cursor.get() >= index + currentText.length()) {
+ messages.add(message);
+ } else {
+ if (cursor.get() > index) {
+ String beforeText = currentText.substring(0, cursor.get() - index);
+ messages.add(new Message(message.getStyle(), beforeText));
+ }
+ if (cursor.get() >= index)
+ messages.add(new Message(styleBuilder.build(), text));
+ if (cursor.get() + text.length() < index) {
+ messages.add(message);
+ } else if (cursor.get() + text.length() < index + currentText.length()) {
+ String afterText = currentText.substring(cursor.get() + text.length() - index, currentText.length());
+ messages.add(new Message(message.getStyle(), afterText));
+ }
+ }
+ index += currentText.length();
+ }
- if (cursor.get() >= index) {
- messages.add(new Message(styleBuilder.build(), text));
- cursor.set(index + text.length());
- } else {
- cursor.addAndGet(text.length());
- }
-
- return null;
+ if (cursor.get() >= index) {
+ messages.add(new Message(styleBuilder.build(), text));
+ cursor.set(index + text.length());
+ } else {
+ cursor.addAndGet(text.length());
+ }
+
+ return null;
}
-
+
};
- BiFunction<Character, String, Void> actionPerformer = new BiFunction<Character, String, Void>() {
+ BiFunction<Character, String, Void> actionPerformer = new BiFunction<>() {
private void eraseToEndOfLine() {
- if (cursor.get() < 0)
- cursor.set(0);
-
- int index = 0;
- List<Message> copy = new ArrayList<>(messages);
- messages.clear();
- for (Message message: copy) {
- String currentText = message.getText();
- if (cursor.get() < index + currentText.length()) {
- if (cursor.get() > index)
- messages.add(new Message(message.getStyle(), currentText.substring(0, cursor.get()-index)));
- } else {
- messages.add(message);
- }
- index += currentText.length();
- }
+ if (cursor.get() < 0)
+ cursor.set(0);
+
+ int index = 0;
+ List<Message> copy = new ArrayList<>(messages);
+ messages.clear();
+ for (Message message : copy) {
+ String currentText = message.getText();
+ if (cursor.get() < index + currentText.length()) {
+ if (cursor.get() > index)
+ messages.add(new Message(message.getStyle(), currentText.substring(0, cursor.get() - index)));
+ } else {
+ messages.add(message);
+ }
+ index += currentText.length();
+ }
}
-
+
private void eraseToCursor() {
- if (cursor.get() < 0)
- cursor.set(0);
-
- int index = 0;
- List<Message> copy = new ArrayList<>(messages);
- messages.clear();
- for (Message message: copy) {
- String currentText = message.getText();
- if (cursor.get() <= index) {
- messages.add(message);
- } else if (cursor.get() < index + currentText.length()) {
- String remainingText = currentText.substring(cursor.get()-index, currentText.length());
- messages.add(new Message(message.getStyle(), remainingText));
- }
- index += currentText.length();
- }
+ if (cursor.get() < 0)
+ cursor.set(0);
+
+ int index = 0;
+ List<Message> copy = new ArrayList<>(messages);
+ messages.clear();
+ for (Message message : copy) {
+ String currentText = message.getText();
+ if (cursor.get() <= index) {
+ messages.add(message);
+ } else if (cursor.get() < index + currentText.length()) {
+ String remainingText = currentText.substring(cursor.get() - index, currentText.length());
+ messages.add(new Message(message.getStyle(), remainingText));
+ }
+ index += currentText.length();
+ }
}
-
+
@Override
public Void apply(Character action, String actionData) {
- switch (action) {
- case 'C':
- cursor.addAndGet(Integer.parseInt(actionData));
- break;
- case 'D':
- cursor.addAndGet(-1*Integer.parseInt(actionData));
- break;
- case 'K':
- case 'J':
- if (actionData.length() == 0 || actionData.equals("0"))
- eraseToEndOfLine();
- else if (actionData.equals("1"))
- eraseToCursor();
- else
- messages.clear();
- break;
- case 'G':
- if (actionData.length() == 0)
- cursor.set(0);
- else
- cursor.set(Integer.parseInt(actionData)-1);
- break;
- case 'H':
- case 'f':
- List<String> fields = Splitter.on(";").splitToList(actionData);
- if (fields.size() == 2)
- cursor.set(Integer.parseInt(fields.get(1))-1);
- else
- cursor.set(0);
- break;
- case 'm':
- fields = Splitter.on(";").splitToList(actionData);
- for (int i=0; i<fields.size(); i++) {
- String field = fields.get(i);
- if (field.equals("0") || field.equals("")) {
- styleBuilder.reset();
- } else if (field.equals("1")) {
- styleBuilder.setBold(true);
- } else if (field.equals("22")) {
- styleBuilder.setBold(false);
- } else if (field.equals("7") || field.equals("27")) {
- styleBuilder.swapForegroundAndBackGround();
- } else if (field.equals("30") || field.equals("31") || field.equals("32")
- || field.equals("33") || field.equals("34") || field.equals("35")
- || field.equals("36") || field.equals("37") || field.equals("90")
- || field.equals("91") || field.equals("92") || field.equals("93")
- || field.equals("94") || field.equals("95") || field.equals("96")
- || field.equals("97")) {
- styleBuilder.setColor(field);
- } else if (field.equals("40") || field.equals("41") || field.equals("42")
- || field.equals("43") || field.equals("44") || field.equals("45")
- || field.equals("46") || field.equals("47") || field.equals("100")
- || field.equals("101") || field.equals("102") || field.equals("103")
- || field.equals("104") || field.equals("105") || field.equals("106")
- || field.equals("107")) {
- styleBuilder.setBackgroundColor(field);
- } else if (field.equals("39")) {
- styleBuilder.setColor(Style.FOREGROUND_COLOR_DEFAULT);
- } else if (field.equals("49")) {
- styleBuilder.setColor(Style.BACKGROUND_COLOR_DEFAULT);
- } else if (field.equals("38") || field.equals("48") || field.equals("58")) {
- if (fields.get(++i).equals("5"))
- i++;
- else
- i += 3;
- }
- }
- break;
- }
+ switch (action) {
+ case 'C':
+ cursor.addAndGet(Integer.parseInt(actionData));
+ break;
+ case 'D':
+ cursor.addAndGet(-1 * Integer.parseInt(actionData));
+ break;
+ case 'K':
+ case 'J':
+ if (actionData.length() == 0 || actionData.equals("0"))
+ eraseToEndOfLine();
+ else if (actionData.equals("1"))
+ eraseToCursor();
+ else
+ messages.clear();
+ break;
+ case 'G':
+ if (actionData.length() == 0)
+ cursor.set(0);
+ else
+ cursor.set(Integer.parseInt(actionData) - 1);
+ break;
+ case 'H':
+ case 'f':
+ List<String> fields = Splitter.on(";").splitToList(actionData);
+ if (fields.size() == 2)
+ cursor.set(Integer.parseInt(fields.get(1)) - 1);
+ else
+ cursor.set(0);
+ break;
+ case 'm':
+ fields = Splitter.on(";").splitToList(actionData);
+ for (int i = 0; i < fields.size(); i++) {
+ String field = fields.get(i);
+ if (field.equals("0") || field.equals("")) {
+ styleBuilder.reset();
+ } else if (field.equals("1")) {
+ styleBuilder.setBold(true);
+ } else if (field.equals("22")) {
+ styleBuilder.setBold(false);
+ } else if (field.equals("7") || field.equals("27")) {
+ styleBuilder.swapForegroundAndBackGround();
+ } else if (field.equals("30") || field.equals("31") || field.equals("32")
+ || field.equals("33") || field.equals("34") || field.equals("35")
+ || field.equals("36") || field.equals("37") || field.equals("90")
+ || field.equals("91") || field.equals("92") || field.equals("93")
+ || field.equals("94") || field.equals("95") || field.equals("96")
+ || field.equals("97")) {
+ styleBuilder.setColor(field);
+ } else if (field.equals("40") || field.equals("41") || field.equals("42")
+ || field.equals("43") || field.equals("44") || field.equals("45")
+ || field.equals("46") || field.equals("47") || field.equals("100")
+ || field.equals("101") || field.equals("102") || field.equals("103")
+ || field.equals("104") || field.equals("105") || field.equals("106")
+ || field.equals("107")) {
+ styleBuilder.setBackgroundColor(field);
+ } else if (field.equals("39")) {
+ styleBuilder.setColor(Style.FOREGROUND_COLOR_DEFAULT);
+ } else if (field.equals("49")) {
+ styleBuilder.setBackgroundColor(Style.BACKGROUND_COLOR_DEFAULT);
+ } else if (field.equals("38") || field.equals("48") || field.equals("58")) {
+ if (fields.get(++i).equals("5"))
+ i++;
+ else
+ i += 3;
+ }
+ }
+ break;
+ }
return null;
- };
+ }
+
+ ;
};
StringBuilder actionDataBuilder = null;
diff --git a/server-core/src/test/java/io/onedev/server/buildspec/job/log/JobLogEntryExTest.java b/server-core/src/test/java/io/onedev/server/buildspec/job/log/JobLogEntryExTest.java
index 679823a2ad..2fa547b81c 100644
--- a/server-core/src/test/java/io/onedev/server/buildspec/job/log/JobLogEntryExTest.java
+++ b/server-core/src/test/java/io/onedev/server/buildspec/job/log/JobLogEntryExTest.java
@@ -13,7 +13,14 @@ public class JobLogEntryExTest {
@Test
public void test() {
JobLogEntryEx entry;
-
+
+ var styleBuilder = new StyleBuilder();
+ JobLogEntryEx.parse("\u001B[30;43ma\u001B[39;49m", styleBuilder);
+ entry = JobLogEntryEx.parse("\u001B[34mb\u001B[39m", styleBuilder);
+ assertEquals(Lists.newArrayList(
+ new Message(new Style("34", Style.BACKGROUND_COLOR_DEFAULT, false), "b")
+ ), entry.getMessages());
+
entry = JobLogEntryEx.parse("a\r\nb", new StyleBuilder());
assertEquals(Lists.newArrayList(
new Message(new Style(Style.FOREGROUND_COLOR_DEFAULT, Style.BACKGROUND_COLOR_DEFAULT, false), "a\nb")
diff --git a/server-plugin/server-plugin-buildspec-python/src/main/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestion.java b/server-plugin/server-plugin-buildspec-python/src/main/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestion.java
index 00112bcfce..ab924e910d 100644
--- a/server-plugin/server-plugin-buildspec-python/src/main/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestion.java
+++ b/server-plugin/server-plugin-buildspec-python/src/main/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestion.java
@@ -93,6 +93,7 @@ public class PythonJobSuggestion implements JobSuggestion {
testAndLint.setName("test and lint");
testAndLint.setImage("1dev/poetry:1.0.1");
String commands = "" +
+ "poetry config virtualenvs.create false\n" +
"poetry install\n" +
"poetry add coverage ruff\n";
@@ -129,10 +130,10 @@ public class PythonJobSuggestion implements JobSuggestion {
job.getSteps().add(generateChecksum);
var setupCache = new SetupCacheStep();
- setupCache.setName("set up venv cache");
- setupCache.setKey("venv_cache_@file:checksum@");
- setupCache.setPaths(Lists.newArrayList(".venv"));
- setupCache.getLoadKeys().add("venv_cache");
+ setupCache.setName("set up pip cache");
+ setupCache.setKey("pip_cache_@file:checksum@");
+ setupCache.setPaths(Lists.newArrayList("/root/.cache/pip"));
+ setupCache.getLoadKeys().add("pip_cache");
job.getSteps().add(setupCache);
CommandStep testAndLint = new CommandStep();
@@ -141,8 +142,6 @@ public class PythonJobSuggestion implements JobSuggestion {
testAndLint.setName("test and lint");
testAndLint.setImage("python:3.11");
var commands = "" +
- "python -m venv .venv\n" +
- "source .venv/bin/activate\n" +
"pip install -r requirements.txt\n" +
"pip install coverage ruff\n";
@@ -153,7 +152,7 @@ public class PythonJobSuggestion implements JobSuggestion {
commands += "coverage run -m unittest\n";
interpreter.setCommands(commands +
"coverage xml\n" +
- "ruff check --exit-zero --output-format=json --output-file=ruff-result.json --exclude=.git --exclude=.venv");
+ "ruff check --exit-zero --output-format=json --output-file=ruff-result.json --exclude=.git");
job.getSteps().add(testAndLint);
if (withPytest)
job.getSteps().add(newUnitTestReportPublishStep());
@@ -179,10 +178,10 @@ public class PythonJobSuggestion implements JobSuggestion {
job.getSteps().add(generateChecksum);
var setupCache = new SetupCacheStep();
- setupCache.setName("set up venv cache");
- setupCache.setKey("venv_cache_@file:checksum@");
- setupCache.setPaths(Lists.newArrayList(".venv"));
- setupCache.getLoadKeys().add("venv_cache");
+ setupCache.setName("set up pip cache");
+ setupCache.setKey("pip_cache_@file:checksum@");
+ setupCache.setPaths(Lists.newArrayList("/root/.cache/pip"));
+ setupCache.getLoadKeys().add("pip_cache");
job.getSteps().add(setupCache);
var blobContent = blob.getText().getContent();
@@ -205,8 +204,6 @@ public class PythonJobSuggestion implements JobSuggestion {
testAndLint.setName("test and lint");
testAndLint.setImage("python:3.11");
var commands = "" +
- "python -m venv .venv\n" +
- "source .venv/bin/activate\n" +
"pip install .\n" +
"pip install coverage ruff\n";
@@ -227,7 +224,7 @@ public class PythonJobSuggestion implements JobSuggestion {
commands += "coverage run -m unittest\n";
interpreter.setCommands(commands +
"coverage xml\n" +
- "ruff check --exit-zero --output-format=json --output-file=ruff-result.json --exclude=.git --exclude=.venv");
+ "ruff check --exit-zero --output-format=json --output-file=ruff-result.json --exclude=.git");
job.getSteps().add(testAndLint);
if (withPytest)
job.getSteps().add(newUnitTestReportPublishStep());