Skip to content

The Unified and Autonomous Development Platform

Update build environment

OneDevcc743f18b7b4
diff --git a/.onedev-buildspec b/.onedev-buildspec
index c92a4b915b..51cd54e62e 100644
--- a/.onedev-buildspec
+++ b/.onedev-buildspec
@@ -5,16 +5,13 @@
<io.onedev.server.buildspec.job.Job>
<name>CI</name>
<paramSpecs/>
- <image>1dev/build-environment:1.0</image>
+ <image>1dev/build-environment:1.1</image>
<commands>
<string>set -e</string>
<string>echo "Detecting project version (may require some time while downloading maven dependencies)..."</string>
<string>buildVersion=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)</string>
<string>echo "##onedev[SetBuildVersion '$buildVersion']"</string>
- <string>mvn package</string>
- <string>cp server-product/target/*.zip .</string>
- <string>mkdir -p site/lib</string>
- <string>cp server-product/target/sandbox/site/lib/mysql* server-product/target/sandbox/site/lib/postgresql* site/lib</string>
+ <string>mvn test</string>
</commands>
<retrieveSource>true</retrieveSource>
<cloneDepth>1</cloneDepth>
@@ -22,13 +19,15 @@
<jobDependencies/>
<projectDependencies/>
<services/>
- <artifacts>*.zip site/**</artifacts>
<reports/>
<triggers>
<io.onedev.server.buildspec.job.trigger.BranchUpdateTrigger>
<params/>
<branches>master</branches>
</io.onedev.server.buildspec.job.trigger.BranchUpdateTrigger>
+ <io.onedev.server.buildspec.job.trigger.PullRequestTrigger>
+ <params/>
+ </io.onedev.server.buildspec.job.trigger.PullRequestTrigger>
</triggers>
<caches>
<io.onedev.server.buildspec.job.CacheSpec>
@@ -45,9 +44,9 @@
<retryDelay>30</retryDelay>
</io.onedev.server.buildspec.job.Job>
<io.onedev.server.buildspec.job.Job>
- <name>QA</name>
+ <name>Release</name>
<paramSpecs/>
- <image>1dev/build-environment:1.0</image>
+ <image>1dev/build-environment:1.1</image>
<commands>
<string>set -e</string>
<string>docker login -u robinshen -p @secrets:dockerhub-password@</string>
@@ -56,67 +55,17 @@
<string>buildVersion=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)</string>
<string>echo "##onedev[SetBuildVersion '$buildVersion']"</string>
<string></string>
- <string>cp -r server-product/docker docker</string>
- <string>unzip onedev-${buildVersion}.zip -d docker</string>
- <string>mv docker/onedev-${buildVersion} docker/app</string>
- <string>cp site/lib/* docker/app/site/lib</string>
- <string></string>
- <string>docker build -t 1dev/server:qa-${buildVersion} docker</string>
- <string>docker push 1dev/server:qa-${buildVersion}</string>
+ <string># Skip test as we've already tested in CI build</string>
+ <string>mvn -Dmaven.test.skip=true deploy</string>
<string></string>
- <string>cp -r server-product/k8s k8s-resources</string>
- <string>find k8s-resources -name "*.yaml" | xargs sed -i -e "s/\\${buildVersion}/qa-${buildVersion}/g"</string>
- <string>zip -r k8s-resources.zip k8s-resources</string>
+ <string>curl -u onedev:@secrets:maven-deploy-password@ -f -d \@/root/.m2/archetype-catalog.xml -X PUT "https://artifact.onedev.io/artifactory/onedev/archetype-catalog.xml"</string>
<string></string>
- <string>cat &lt;&lt; EOF &gt; run-as-docker.sh</string>
- <string>docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock -v \\$(which docker):/usr/bin/docker -v \\$(pwd)/onedev:/opt/onedev -p 6610:6610 1dev/server:qa-${buildVersion}</string>
- <string>EOF</string>
- </commands>
- <retrieveSource>true</retrieveSource>
- <cloneDepth>1</cloneDepth>
- <submoduleCredentials/>
- <jobDependencies>
- <io.onedev.server.buildspec.job.JobDependency>
- <jobName>CI</jobName>
- <requireSuccessful>true</requireSuccessful>
- <jobParams/>
- <artifacts>**</artifacts>
- </io.onedev.server.buildspec.job.JobDependency>
- </jobDependencies>
- <projectDependencies/>
- <services/>
- <artifacts>*.zip *.sh</artifacts>
- <reports/>
- <triggers/>
- <caches>
- <io.onedev.server.buildspec.job.CacheSpec>
- <key>maven-cache</key>
- <path>/root/.m2/repository</path>
- </io.onedev.server.buildspec.job.CacheSpec>
- </caches>
- <cpuRequirement>250m</cpuRequirement>
- <memoryRequirement>128m</memoryRequirement>
- <timeout>3600</timeout>
- <postBuildActions/>
- <retryCondition>never</retryCondition>
- <maxRetries>3</maxRetries>
- <retryDelay>30</retryDelay>
- </io.onedev.server.buildspec.job.Job>
- <io.onedev.server.buildspec.job.Job>
- <name>Release</name>
- <paramSpecs/>
- <image>1dev/build-environment:1.0</image>
- <commands>
- <string>set -e</string>
- <string>docker login -u robinshen -p @secrets:dockerhub-password@</string>
- <string></string>
- <string>echo "Detecting project version (may require some time while downloading maven dependencies)..."</string>
- <string>buildVersion=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)</string>
- <string>echo "##onedev[SetBuildVersion '$buildVersion']"</string>
+ <string>cp -r server-product/docker docker</string>
+ <string>unzip server-product/target/onedev-${buildVersion}.zip -d docker</string>
+ <string>mv docker/onedev-${buildVersion} docker/app</string>
+ <string>cp server-product/target/sandbox/site/lib/mysql* server-product/target/sandbox/site/lib/postgresql* docker/app/site/lib</string>
<string></string>
- <string>docker pull 1dev/server:qa-${buildVersion}</string>
- <string>docker tag 1dev/server:qa-${buildVersion} 1dev/server:${buildVersion}</string>
- <string>docker tag 1dev/server:qa-${buildVersion} 1dev/server:latest</string>
+ <string>docker build -t 1dev/server:latest 1dev/server:${buildVersion} docker</string>
<string>docker push 1dev/server:${buildVersion}</string>
<string>docker push 1dev/server:latest</string>
<string></string>
@@ -133,10 +82,9 @@
<submoduleCredentials/>
<jobDependencies>
<io.onedev.server.buildspec.job.JobDependency>
- <jobName>QA</jobName>
+ <jobName>CI</jobName>
<requireSuccessful>true</requireSuccessful>
<jobParams/>
- <artifacts>*.zip</artifacts>
</io.onedev.server.buildspec.job.JobDependency>
</jobDependencies>
<projectDependencies/>
diff --git a/settings.xml b/settings.xml
deleted file mode 100644
index 1d83f039ca..0000000000
--- a/settings.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
- https://maven.apache.org/xsd/settings-1.0.0.xsd">
- <servers>
- <server>
- <id>onedev</id>
- <username>onedev</username>
- <password>${maven.deploy.password}</password>
- </server>
- </servers>
-</settings>
\ No newline at end of file