Browse Source

Support for publishing from TeamCity.

Change-Id: I1364a4b364acf217ed9769f7b489a47d67cf4a87
Reviewed-on: http://gerrit.dmdirc.com/3904
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
pull/1/head
Chris Smith 9 years ago
parent
commit
1fc466cd9a
3 changed files with 17 additions and 3 deletions
  1. 1
    0
      .gitignore
  2. 15
    3
      build-ivy.xml
  3. 1
    0
      etc/ivy/ivysettings.xml

+ 1
- 0
.gitignore View File

@@ -48,3 +48,4 @@ __history
48 48
 /atlassian-ide-plugin.xml
49 49
 /.gradle
50 50
 /*/build
51
+/etc/nexus-teamcity.properties

+ 15
- 3
build-ivy.xml View File

@@ -22,19 +22,31 @@
22 22
 
23 23
     <target name="publish-integration" depends="-init-dependencies,jar">
24 24
         <copy file="dist/DMDirc.jar" tofile="dist/client.jar"/>
25
-        <ivy:deliver deliverpattern="build/ivy.xml" pubrevision="${git.version}" />
25
+        <ivy:deliver deliverpattern="build/ivy.xml" pubrevision="${git.version}-SNAPSHOT" />
26 26
         <ivy:makepom ivyfile="build/ivy.xml" pomfile="dist/client.pom">
27 27
             <mapping conf="main" scope="compile"/>
28 28
         </ivy:makepom>
29 29
         <ivy:resolve file="build/ivy.xml"/>
30 30
         <ivy:retrieve/>
31
-        <ivy:publish resolver="dmdirc-releases"
31
+        <ivy:publish resolver="dmdirc-snapshots"
32 32
                      organisation="com.dmdirc"
33 33
                      module="client"
34
-                     revision="${git.version}"
34
+                     revision="${git.version}-SNAPSHOT"
35 35
                      status="integration"
36 36
                      artifactspattern="dist/[artifact].[ext]"
37 37
                      publishivy="false">
38 38
         </ivy:publish>
39 39
     </target>
40
+
41
+    <target name="publish-from-teamcity" depends="-init-dependencies">
42
+        <echo>Downloading private files, if this fails please pass username and</echo>
43
+        <echo>password to ant using -Dusername=... -Dpassword=...</echo>
44
+
45
+        <get src="http://www.dmdirc.com/private/nexus-teamcity.properties" dest="etc/nexus-teamcity.properties" username="${username}" password="${password}"/>
46
+        <loadproperties srcFile="etc/nexus-teamcity.properties"/>
47
+
48
+        <ivy:settings>
49
+          <credentials host="nexus.dmdirc.com" realm="Sonatype Nexus Repository Manager" username="${nexus.user}" passwd="${nexus.pass}"/>
50
+        </ivy:settings>
51
+    </target>
40 52
 </project>

+ 1
- 0
etc/ivy/ivysettings.xml View File

@@ -9,6 +9,7 @@
9 9
         <ibiblio name="jgit" root="http://download.eclipse.org/jgit/maven" m2compatible="true"/>
10 10
         <ibiblio name="dmdirc-thirdparty" root="http://nexus.dmdirc.com/nexus/content/repositories/thirdparty/" m2compatible="true"/>
11 11
         <ibiblio name="dmdirc-releases" root="http://nexus.dmdirc.com/nexus/content/repositories/releases/" m2compatible="true"/>
12
+        <ibiblio name="dmdirc-snapshots" root="http://nexus.dmdirc.com/nexus/content/repositories/snapshots/" m2compatible="true"/>
12 13
 
13 14
         <url name="ant-nsis">
14 15
             <artifact pattern="https://cloud.github.com/downloads/dreese/nsis-ant/nsisant-[revision].jar"/>

Loading…
Cancel
Save