Skip to content

The Unified and Autonomous Development Platform

polish Ruby Django Gradle DefaultCISpec

jiangjinwen0c3eae71df66
diff --git a/server-plugin/server-plugin-android/src/main/java/org/server/plugin/android/DefaultAndriodCISpecProvider.java b/server-plugin/server-plugin-android/src/main/java/org/server/plugin/android/DefaultAndriodCISpecProvider.java
index a11b8d02f8..8b9f974a5c 100644
--- a/server-plugin/server-plugin-android/src/main/java/org/server/plugin/android/DefaultAndriodCISpecProvider.java
+++ b/server-plugin/server-plugin-android/src/main/java/org/server/plugin/android/DefaultAndriodCISpecProvider.java
@@ -1,9 +1,8 @@
package org.server.plugin.android;
+import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import io.onedev.server.ci.CISpec;
import io.onedev.server.ci.DefaultCISpecProvider;
@@ -16,70 +15,117 @@ import io.onedev.server.model.Project;
public class DefaultAndriodCISpecProvider implements DefaultCISpecProvider {
- private static final Logger logger = LoggerFactory.getLogger(DefaultAndriodCISpecProvider.class);
-
+
@Override
public CISpec getDefaultCISpec(Project project, ObjectId commitId) {
- Blob androidBlob = project.getBlob(new BlobIdent(commitId.name(), "build.gradle", FileMode.TYPE_FILE), false);
+ Blob gradleBlob = project.getBlob(new BlobIdent(commitId.name(), "build.gradle", FileMode.TYPE_FILE), false);
+ Blob kotlinBlob = project.getBlob(new BlobIdent(commitId.name(), "build.gradle.kts", FileMode.TYPE_FILE), false);
+ if (gradleBlob != null ) {
+ return getJob(project,commitId,gradleBlob);
+ }
+ if(kotlinBlob != null) {
+ return getJob(project,commitId,kotlinBlob);
+ }
+ return null;
+
+ }
+
+ private CISpec getJob(Project project, ObjectId commitId,Blob blob) {
+
+ CISpec ciSpec = new CISpec();
- if (androidBlob != null ) {
-
- CISpec ciSpec = new CISpec();
-
- Job job = new Job();
+ Job job = new Job();
- job.setName("ci");
-
+ job.setName("ci");
+
+ String version = null;
+
+ String jdkVersion = null;
+
+ Blob androidBlob = project.getBlob(new BlobIdent(commitId.name(), "app/build.gradle", FileMode.TYPE_FILE), false);
+
+ if(androidBlob != null) {
+ version = getVersion(androidBlob, "versionName");
job.setEnvironment("ekreative/android");
-
- String version = null;
-
- Blob versionBlob = project.getBlob(new BlobIdent(commitId.name(), "app/build.gradle", FileMode.TYPE_FILE), false);
-
- if(versionBlob != null) {
- String string = versionBlob.getText().getContent();
- String[] strings = string.split("\n");
- for(String string2:strings) {
- if(string2.contains("versionName")) {
- int first = string2.indexOf("\"");
- int last = string2.lastIndexOf("\"");
- version = string2.substring(first+1, last);
- break;
- }
- }
- if(version == null)
- version = "0.0.0";
- }else {
- version = "0.0.0";
- }
job.setCommands("set -e\n"
+"buildVersion="+version+"\n"
+ "echo \"##onedev[SetBuildVersion '$buildVersion']\"\n"
+ "./gradlew test\n"
+ "./gradlew assembleDebug");
- // Trigger the job automatically when there is a push to the branch
- BranchUpdateTrigger trigger = new BranchUpdateTrigger();
- job.getTriggers().add(trigger);
-
- /*
- * Cache Django local repository in order not to download Django dependencies all over again for
- * subsequent builds
- */
- CacheSpec cache = new CacheSpec();
- cache.setKey("android-local-repository");
- cache.setPath("/root/.gradle");
- job.getCaches().add(cache);
+ }else {
+ version = getVersion(blob, "version");
+ jdkVersion = getVersion(blob, "sourceCompatibility");
+ if(isValidInt(jdkVersion)) {
+ int jdkVersionInt=Integer.parseInt(jdkVersion);
+ if(jdkVersionInt>8)
+ {
+ job.setEnvironment("gradle");
+ }
+ else
+ {
+ job.setEnvironment("gradle:5.5.1-jdk8");
+ }
- ciSpec.getJobs().add(job);
+ }else {
+ job.setEnvironment("gradle:5.5.1-jdk8");
+ }
- return ciSpec;
- }else {
- return null;
- }
+ job.setCommands("set -e\n"
+ +"buildVersion="+version+"\n"
+ + "echo \"##onedev[SetBuildVersion '$buildVersion']\"\n"
+ + "gradle clean \n"
+ + "gradle build"
+ );
+ }
+
+ // Trigger the job automatically when there is a push to the branch
+ BranchUpdateTrigger trigger = new BranchUpdateTrigger();
+ job.getTriggers().add(trigger);
+
+ /*
+ * Cache Django local repository in order not to download Django dependencies all over again for
+ * subsequent builds
+ */
+ CacheSpec cache = new CacheSpec();
+ cache.setKey("android-local-repository");
+ cache.setPath("/root/.gradle");
+ job.getCaches().add(cache);
+
+ ciSpec.getJobs().add(job);
+
+ return ciSpec;
+
}
+
+ private String getVersion(Blob blob,String containName) {
+ String projectVersion = null;
+ String blobString = blob.getText().getContent();
+ String[] blobStrings = blobString.split("\n");
+ for(String targetString : blobStrings) {
+ targetString = StringUtils.trim(targetString);
+ if(targetString.startsWith(containName)) {
+ projectVersion = StringUtils.substringAfter(targetString,"=");
+ projectVersion = StringUtils.strip(projectVersion.trim(),"'\"");
+ break;
+ }
+ }
+ if(projectVersion == null)
+ projectVersion = " ";
+ return projectVersion;
+ }
+ //判断字符串是否是整数
+ private boolean isValidInt(String value) {
+ try {
+ Integer.parseInt(value);
+ } catch (NumberFormatException e) {
+ return false;
+ }
+ return true;
+ }
+
@Override
public int getPriority() {
diff --git a/server-plugin/server-plugin-asp.net/pom.xml b/server-plugin/server-plugin-asp.net/pom.xml
deleted file mode 100644
index 7dca469f89..0000000000
--- a/server-plugin/server-plugin-asp.net/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>server-plugin-asp.net</artifactId>
- <parent>
- <groupId>io.onedev</groupId>
- <artifactId>server-plugin</artifactId>
- <version>3.0.1</version>
- </parent>
- <properties>
- <moduleClass>org.server.plugin.asp.net.AspModule</moduleClass>
- </properties>
-</project>
diff --git a/server-plugin/server-plugin-asp.net/src/main/java/org/server/plugin/asp/net/AspModule.java b/server-plugin/server-plugin-asp.net/src/main/java/org/server/plugin/asp/net/AspModule.java
deleted file mode 100644
index 4a1e0070fc..0000000000
--- a/server-plugin/server-plugin-asp.net/src/main/java/org/server/plugin/asp/net/AspModule.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.server.plugin.asp.net;
-
-import io.onedev.commons.launcher.loader.AbstractPluginModule;
-import io.onedev.server.ci.DefaultCISpecProvider;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class AspModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- // put your guice bindings here
- contribute(DefaultCISpecProvider.class, DefaultAspCISpecProvider.class);
- }
-
-}
diff --git a/server-plugin/server-plugin-asp.net/src/main/java/org/server/plugin/asp/net/DefaultAspCISpecProvider.java b/server-plugin/server-plugin-asp.net/src/main/java/org/server/plugin/asp/net/DefaultAspCISpecProvider.java
deleted file mode 100644
index 949d156785..0000000000
--- a/server-plugin/server-plugin-asp.net/src/main/java/org/server/plugin/asp/net/DefaultAspCISpecProvider.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.server.plugin.asp.net;
-
-import java.io.StringReader;
-
-import org.dom4j.Document;
-import org.dom4j.DocumentException;
-import org.dom4j.Node;
-import org.dom4j.io.SAXReader;
-import org.eclipse.jgit.lib.FileMode;
-import org.eclipse.jgit.lib.ObjectId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.onedev.server.ci.CISpec;
-import io.onedev.server.ci.DefaultCISpecProvider;
-import io.onedev.server.ci.job.CacheSpec;
-import io.onedev.server.ci.job.Job;
-import io.onedev.server.ci.job.trigger.BranchUpdateTrigger;
-import io.onedev.server.git.Blob;
-import io.onedev.server.git.BlobIdent;
-import io.onedev.server.model.Project;
-
-public class DefaultAspCISpecProvider implements DefaultCISpecProvider {
-
- private static final Logger logger = LoggerFactory.getLogger(DefaultAspCISpecProvider.class);
-
- @Override
- public CISpec getDefaultCISpec(Project project, ObjectId commitId) {
- Blob blob = project.getBlob(new BlobIdent(commitId.name(), project.getName()+".csproj", FileMode.TYPE_FILE), false);
-
- if (blob != null) {
- Document document;
- try {
- document = new SAXReader().read(new StringReader(blob.getText().getContent()));
- } catch (DocumentException e) {
- logger.debug("Error parsing .csproj(project: {}, commit: {})",
- project.getName(), commitId.getName(), e);
- return null;
- }
-
- String aspVersion = " ";
-
- // Use XPath with localname as POM project element may contain xmlns definition
- Node node = document.selectSingleNode("//*[local-name()='TargetFramework']");
- if (node != null) {
- aspVersion = node.getText().trim();
- } else {
- return null;
- }
-
- CISpec ciSpec = new CISpec();
-
- Job job = new Job();
-
- job.setName("ci");
-
- job.setEnvironment("microsoft/dotnet:2.1-aspnetcore-runtime");
-
- /*
- * Before running maven test, we extract version of the project and use LogInstruction to tell
- * OneDev using extracted version for current build
- */
- job.setCommands(""
- + "echo \"Detecting project version (may require some time while downloading maven dependencies)...\"\n"
- + "echo\n"
- + "docker run -d -p 5000:5000 '$job.getEnvironment()'");
-
- // Trigger the job automatically when there is a push to the branch
- BranchUpdateTrigger trigger = new BranchUpdateTrigger();
- job.getTriggers().add(trigger);
-
- /*
- * Cache Maven local repository in order not to download Maven dependencies all over again for
- * subsequent builds
- */
- CacheSpec cache = new CacheSpec();
- cache.setKey("asp-local-repository");
- cache.setPath("/root/.asp");
- job.getCaches().add(cache);
-
- ciSpec.getJobs().add(job);
-
- return ciSpec;
- } else {
- return null;
- }
- }
-
- @Override
- public int getPriority() {
- return DEFAULT_PRIORITY;
- }
-
-}
diff --git a/server-plugin/server-plugin-django/src/main/java/org/server/plugin/django/DefaultDjangoCISpecProvider.java b/server-plugin/server-plugin-django/src/main/java/org/server/plugin/django/DefaultDjangoCISpecProvider.java
index b6ac434d36..07125eb5de 100644
--- a/server-plugin/server-plugin-django/src/main/java/org/server/plugin/django/DefaultDjangoCISpecProvider.java
+++ b/server-plugin/server-plugin-django/src/main/java/org/server/plugin/django/DefaultDjangoCISpecProvider.java
@@ -1,9 +1,8 @@
package org.server.plugin.django;
+import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import io.onedev.server.ci.CISpec;
import io.onedev.server.ci.DefaultCISpecProvider;
@@ -16,7 +15,6 @@ import io.onedev.server.model.Project;
public class DefaultDjangoCISpecProvider implements DefaultCISpecProvider {
- private static final Logger logger = LoggerFactory.getLogger(DefaultDjangoCISpecProvider.class);
@Override
public CISpec getDefaultCISpec(Project project, ObjectId commitId) {
@@ -40,17 +38,10 @@ public class DefaultDjangoCISpecProvider implements DefaultCISpecProvider {
String version = null;
if (projectVersionBlob != null) {
- String string = projectVersionBlob.getText().getContent();
- String[] strings = string.split("\n");
- for(String string2:strings) {
- if(string2.contains("version")) {
- int first = string2.indexOf("'");
- int last = string2.lastIndexOf("'");
- version = string2.substring(first+1, last);
- break;
- }
- }
- if(version == null)
+
+ version = getVersion(projectVersionBlob, "version");
+ //Django default version is "0.0.0"
+ if(version.isEmpty())
version = "0.0.0";
job.setCommands("set -e\n"+"buildVersion="+version+"\n"
@@ -90,6 +81,24 @@ public class DefaultDjangoCISpecProvider implements DefaultCISpecProvider {
}
}
+
+ private String getVersion(Blob blob,String containName) {
+ String projectVersion = null;
+ String blobString = blob.getText().getContent();
+ String[] blobStrings = blobString.split("\n");
+ for(String targetString : blobStrings) {
+ targetString = StringUtils.trim(targetString);
+ if(targetString.startsWith(containName)) {
+ projectVersion = StringUtils.substringAfter(targetString,"=");
+ projectVersion = StringUtils.strip(projectVersion.trim(),"'\",");
+ break;
+ }
+ }
+ if(projectVersion == null)
+ projectVersion = " ";
+ return projectVersion;
+ }
+
@Override
public int getPriority() {
diff --git a/server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/DefaultRubyCISpecProvider.java b/server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/DefaultRubyCISpecProvider.java
index e9c7532407..5c92c9c9ad 100644
--- a/server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/DefaultRubyCISpecProvider.java
+++ b/server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/DefaultRubyCISpecProvider.java
@@ -3,8 +3,6 @@ package org.server.plugin.rubyonrails;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import io.onedev.server.ci.CISpec;
import io.onedev.server.ci.DefaultCISpecProvider;
@@ -17,80 +15,107 @@ import io.onedev.server.model.Project;
public class DefaultRubyCISpecProvider implements DefaultCISpecProvider {
- private static final Logger logger = LoggerFactory.getLogger(DefaultRubyCISpecProvider.class);
-
+
@Override
public CISpec getDefaultCISpec(Project project, ObjectId commitId) {
- Blob gemFileLockBlob = project.getBlob(new BlobIdent(commitId.name(), "Gemfile.lock", FileMode.TYPE_FILE), false);
- if(gemFileLockBlob != null) {
-
- return getCISpec(gemFileLockBlob,project,commitId);
+ Blob gemFileLockBlob = project.getBlob(new BlobIdent(commitId.name(), "Gemfile.lock", FileMode.TYPE_FILE),
+ false);
+ if (gemFileLockBlob != null) {
+
+ return getCISpec(gemFileLockBlob, project, commitId);
+
+ } else {
+ Blob gemFileBlob = project.getBlob(new BlobIdent(commitId.name(), "Gemfile", FileMode.TYPE_FILE), false);
+ if (gemFileBlob != null) {
+
+ return getCISpec(gemFileBlob, project, commitId);
- }else {
- Blob gemFileBlob = project.getBlob(new BlobIdent(commitId.name(), "Gemfile", FileMode.TYPE_FILE), false);
- if(gemFileBlob != null) {
-
- return getCISpec(gemFileBlob,project,commitId);
-
- }
-
}
- return null;
+
+ }
+ return null;
}
-
- private CISpec getCISpec(Blob blob,Project project,ObjectId commitId) {
-
+
+ private CISpec getCISpec(Blob blob, Project project, ObjectId commitId) {
+
String version = blob.getText().getContent();
-
- if(version.contains("rails") || version.contains("ruby")) {
+
+ if (version.contains("rails") || version.contains("ruby")) {
CISpec ciSpec = new CISpec();
-
+
Job job = new Job();
job.setName("ci");
-
- Blob rubyVersionBlob = project.getBlob(new BlobIdent(commitId.name(), ".ruby-version", FileMode.TYPE_FILE), false);
-
+
+ Blob rubyVersionBlob = project.getBlob(new BlobIdent(commitId.name(), ".ruby-version", FileMode.TYPE_FILE),
+ false);
+
if (rubyVersionBlob != null) {
-
+
String rubyVersion = rubyVersionBlob.getText().getContent();
- job.setEnvironment(StringUtils.remove(rubyVersion.replace("-", ":"), " "));
+ rubyVersion = StringUtils.trim(rubyVersion);
+
+ rubyVersion = StringUtils.strip(rubyVersion, "ruby-: ");
+
+ job.setEnvironment("ruby:" + rubyVersion);
+
+ } else {
+ job.setEnvironment("ruby");
+ }
+ String projectVersion = null;
+
+ Blob projectVersionBlob = project.getBlob(new BlobIdent(commitId.name(), "config/version.rb", FileMode.TYPE_FILE),
+ false);
+ if(projectVersionBlob != null) {
+
+ String projectVersionBlobContext = projectVersionBlob.getText().getContent();
+
+ String[] blobStrings = projectVersionBlobContext.split("\n");
+ for(String targetString : blobStrings) {
+ targetString = StringUtils.trim(targetString);
+ if(targetString.startsWith("VERSION")) {
+ projectVersion = StringUtils.substringAfter(targetString,"=");
+ projectVersion = StringUtils.strip(projectVersion.trim(),"'\",");
+ break;
+ }
+ }
+
+ }
+ if(projectVersion == null) {
+ job.setCommands("bundle install" + "\n"
+ + "rails test");
}else {
- job.setEnvironment("ruby");
+ job.setCommands("set -e\n"+"buildVersion="+projectVersion+"\n"
+ + "echo \"##onedev[SetBuildVersion '$buildVersion']\"\n"
+ + "bundle install" + "\n"
+ + "rails test");
+
}
-
- setJob(job, ciSpec);
- return ciSpec;
+
+ // Trigger the job automatically when there is a push to the branch
+ BranchUpdateTrigger trigger = new BranchUpdateTrigger();
+ job.getTriggers().add(trigger);
+
+ /*
+ * Cache Gemfile local repository in order not to download rails dependencies
+ * all over again for subsequent builds
+ */
+ CacheSpec cache = new CacheSpec();
+ cache.setKey("bundle-local-repository");
+ cache.setPath("/usr/local/bundle");
+ job.getCaches().add(cache);
+
+ ciSpec.getJobs().add(job);
+ return ciSpec;
+
}
return null;
}
-
- private void setJob(Job job,CISpec ciSpec) {
- job.setCommands(""
- + "echo \"Detecting project version (may require some time while downloading rails dependencies)...\"\n"+
- "bundle install"+ "\n"
- +"rails test");
-
- // Trigger the job automatically when there is a push to the branch
- BranchUpdateTrigger trigger = new BranchUpdateTrigger();
- job.getTriggers().add(trigger);
-
- /*
- * Cache Gemfile local repository in order not to download rails dependencies all over again for
- * subsequent builds
- */
- CacheSpec cache = new CacheSpec();
- cache.setKey("bundle-local-repository");
- cache.setPath("/usr/local/bundle");
- job.getCaches().add(cache);
-
- ciSpec.getJobs().add(job);
- }
@Override
public int getPriority() {
diff --git a/server-product/pom.xml b/server-product/pom.xml
index 550ff650c1..98a42dba94 100644
--- a/server-product/pom.xml
+++ b/server-product/pom.xml
@@ -38,11 +38,6 @@
<artifactId>server-plugin-serverdocker</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>server-plugin-asp.net</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>io.onedev</groupId>
<artifactId>server-plugin-rubyonrails</artifactId>