Merge pull request apache-spark-on-k8s#422 from palantir/move-up-docker-generator-publish

mccheah · web-flow · commit 7dada579aa90 · 2018-10-17T12:59:21.000-07:00
Move Spark docker image generator publish before Spark publish
diff --git a/dev/publish_functions.sh b/dev/publish_functions.sh
@@ -21,8 +21,8 @@ publish_artifacts() {
   echo "<password>$BINTRAY_PASSWORD</password>" >> $tmp_settings
   echo "</server></servers></settings>" >> $tmp_settings
 
-  ./build/mvn -T 1C --settings $tmp_settings -DskipTests "${PALANTIR_FLAGS[@]}" deploy
   ./gradlew --info bintrayUpload
+  ./build/mvn -T 1C --settings $tmp_settings -DskipTests "${PALANTIR_FLAGS[@]}" deploy
 }
 
 make_dist() {

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ publish_artifacts() {`
`21`	`21`	`echo "<password>$BINTRAY_PASSWORD</password>" >> $tmp_settings`
`22`	`22`	`echo "</server></servers></settings>" >> $tmp_settings`
`23`	`23`
`24`		`- ./build/mvn -T 1C --settings $tmp_settings -DskipTests "${PALANTIR_FLAGS[@]}" deploy`
`25`	`24`	`./gradlew --info bintrayUpload`
	`25`	`+ ./build/mvn -T 1C --settings $tmp_settings -DskipTests "${PALANTIR_FLAGS[@]}" deploy`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`make_dist() {`