Skip to content

Commit aeede87

Browse files
author
OneDev
committed
Update build environment to 1.1
Squash pull request #1 of project 'onedev-commons'
1 parent 8a043cc commit aeede87

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

.onedev-buildspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
<io.onedev.server.buildspec.job.Job>
66
<name>Release</name>
77
<paramSpecs/>
8-
<image>@scripts:builtin:maven:determine-docker-image@</image>
8+
<image>1dev/build-environment:1.1</image>
99
<commands>
1010
<string>set -e</string>
1111
<string>echo "Detecting project version (may require some time while downloading maven dependencies)..."</string>
1212
<string>buildVersion=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)</string>
1313
<string>echo "##onedev[SetBuildVersion '$buildVersion']"</string>
14-
<string>cp settings.xml /root/.m2/</string>
15-
<string>mvn clean deploy -Dmaven.deploy.password=@secrets:maven-deploy-password@</string>
14+
<string>mvn deploy -Dmaven.deploy.password=@secrets:maven-deploy-password@</string>
1615
</commands>
1716
<retrieveSource>true</retrieveSource>
1817
<submoduleCredentials/>
@@ -23,6 +22,7 @@
2322
<triggers>
2423
<io.onedev.server.buildspec.job.trigger.BranchUpdateTrigger>
2524
<params/>
25+
<branches>master</branches>
2626
</io.onedev.server.buildspec.job.trigger.BranchUpdateTrigger>
2727
</triggers>
2828
<caches>
@@ -44,7 +44,7 @@
4444
<paramSpecs/>
4545
<image>alpine/git:1.0.7</image>
4646
<commands>
47-
<string>git push https://robinshine:@secrets:github-password@\@github.com/theonedev/commons HEAD:master</string>
47+
<string>git push -f https://robinshine:@secrets:github-password@\@github.com/theonedev/commons HEAD:master</string>
4848
</commands>
4949
<retrieveSource>true</retrieveSource>
5050
<submoduleCredentials/>

settings.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)