Skip to content

Commit

Permalink
Take GeoTrellis version and suffix from environment
Browse files Browse the repository at this point in the history
  • Loading branch information
pomadchin authored and echeipesh committed Oct 25, 2017
1 parent 33ac3a7 commit 6f08694
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions scripts/emr/Makefile
@@ -1,4 +1,6 @@
ASSEMBLY := ../../spark-etl/target/scala-2.11/geotrellis-spark-etl-assembly-1.2.0-SNAPSHOT.jar
GEOTRELLIS_VERSION ?= 1.2.0
GEOTRELLIS_VERSION_SUFFIX ?= -SNAPSHOT
ASSEMBLY := ../../spark-etl/target/scala-2.11/geotrellis-spark-etl-assembly-${GEOTRELLIS_VERSION}${GEOTRELLIS_VERSION_SUFFIX}.jar

${ASSEMBLY}: $(call rwildcard, ../../spark-etl/src, *.scala) ../../spark-etl/build.sbt ../../build.sbt
cd ../../; ./sbt spark-etl/assembly -no-colors
Expand Down Expand Up @@ -44,4 +46,4 @@ start-zeppelin:

upload-assembly: ${ASSEMBLY}
cd terraform; aws emr put --cluster-id ${CLUSTER_ID} --key-pair-file ${KEY_PAIR_FILE} \
--src ../${ASSEMBLY} --dest /tmp/geotrellis-spark-etl-assembly-1.2.0-SNAPSHOT.jar
--src ../${ASSEMBLY} --dest /tmp/geotrellis-spark-etl-assembly-${GEOTRELLIS_VERSION}${GEOTRELLIS_VERSION_SUFFIX}.jar

0 comments on commit 6f08694

Please sign in to comment.