Addressed PR feedback : making a profile to fetch nightly jars only o…

…n CI
apache · Jan 10, 2019 · 1cbc59d · 1cbc59d
1 parent 0495c68
commit 1cbc59d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
@@ -1235,7 +1235,7 @@ nightly_java_demo_test_cpu() {
 nightly_scala_demo_test_cpu() {
     set -ex
     cd /work/mxnet/scala-package/mxnet-demo/scala-demo
-    make scalademo
+    make scalacidemo
     bash bin/demo.sh
     bash bin/run_im.sh
 }

diff --git a/scala-package/mxnet-demo/scala-demo/Makefile b/scala-package/mxnet-demo/scala-demo/Makefile
@@ -17,7 +17,6 @@
 
 SCALA_VERSION_PROFILE := 2.11
 SCALA_VERSION := 2.11.8
-MXNET_VERSION := [1.5.0-SNAPSHOT,\)
 
 ifeq ($(OS),Windows_NT)
 	UNAME_S := Windows
@@ -44,7 +43,11 @@ endif
 scalademo:
 	(mvn package -Dmxnet.profile=$(SCALA_PKG_PROFILE) \
 		-Dmxnet.scalaprofile=$(SCALA_VERSION_PROFILE) \
-		-Dmxnet.version=$(MXNET_VERSION) \
+		-Dscala.version=$(SCALA_VERSION))
+
+scalacidemo:
+	(mvn -Pci-nightly package -Dmxnet.profile=$(SCALA_PKG_PROFILE) \
+		-Dmxnet.scalaprofile=$(SCALA_VERSION_PROFILE) \
 		-Dscala.version=$(SCALA_VERSION))
 
 scalaclean:

diff --git a/scala-package/mxnet-demo/scala-demo/README.md b/scala-package/mxnet-demo/scala-demo/README.md
@@ -4,14 +4,13 @@ This is an project created to use Maven-published Scala package with two Scala e
 User are required to use `mvn package` to build the package,
  which are shown below:
 ```Bash
-export SCALA_VERSION_PROFILE=2.11 SCALA_VERSION=2.11.8 MXNET_VERSION=1.3.0
+export SCALA_VERSION_PROFILE=2.11 SCALA_VERSION=2.11.8
 export SCALA_PKG_PROFILE=
 mvn package -Dmxnet.profile=$(SCALA_PKG_PROFILE) \
 		-Dmxnet.scalaprofile=$(SCALA_VERSION_PROFILE) \
-		-Dmxnet.version=$(MXNET_VERSION) \
 		-Dscala.version=$(SCALA_VERSION)
 ```
-These environment variable (`SCALA_PKG_PROFILE`, `SCALA_VERSION_PROFILE`, `MXNET_VERSION`, `SCALA_VERSION`)
+These environment variable (`SCALA_PKG_PROFILE`, `SCALA_VERSION_PROFILE`, `SCALA_VERSION`)
 should be set before executing the line above.
 
 To obtain the most recent MXNet version, please click [here](https://mvnrepository.com/search?q=org.apache.mxnet)

diff --git a/scala-package/mxnet-demo/scala-demo/pom.xml b/scala-package/mxnet-demo/scala-demo/pom.xml
@@ -9,18 +9,26 @@
     <name>MXNet Scala Demo</name>
     <packaging>pom</packaging>
 
-    <repositories>
-        <repository>
-            <id>Apache Snapshot</id>
-            <url>https://repository.apache.org/content/groups/snapshots</url>
-        </repository>
-    </repositories>
+    <profiles>
+        <profile>
+            <id>ci-nightly</id>
+            <repositories>
+                <repository>
+                    <id>Apache Snapshot</id>
+                    <url>https://repository.apache.org/content/groups/snapshots</url>
+                </repository>
+            </repositories>
+            <properties>
+                <mxnet.version>[1.5.0-SNAPSHOT, )</mxnet.version>
+            </properties>
+        </profile>
+    </profiles>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.mxnet</groupId>
             <artifactId>mxnet-full_${mxnet.scalaprofile}-${mxnet.profile}</artifactId>
-            <version>${mxnet.version}</version>
+            <version>[1.3.1, )</version>
         </dependency>
         <dependency>
             <groupId>org.scala-lang</groupId>