Deploy the right target for Mac, deploy Linux zip release too

umccr · Mar 13, 2019 · aa8311c · aa8311c
1 parent aefcc15
commit aa8311c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,8 @@ install:
   - "./gradlew assemble"
 script:
   - "./gradlew build --stacktrace"
-  - "./gradlew createMacDistZip"
+  - "./gradlew createMacAppDistZip"
+  - "./gradlew createLinuxDistZip"
   - "./gradlew createWinDist"
 
 notifications:

diff --git a/build.gradle b/build.gradle
@@ -229,7 +229,7 @@ task createDist(type: Copy, dependsOn: copyToLib)  {
 
 task createLinuxDistZip(type: Zip, dependsOn: createDist) {
     baseName = "IGV_Linux"
-    archiveName = createLinuxDistZip.baseName + "_${version}_java11.zip"
+    archiveName = createLinuxDistZip.baseName + "_${version}.zip"
     destinationDir = file("${buildDir}/distZip")
     if (!jdkBundleLinux.equals("")) {
         with copySpec { from jdkBundleLinux into "jdk-11" }
@@ -238,7 +238,7 @@ task createLinuxDistZip(type: Zip, dependsOn: createDist) {
         exclude "*.bat"
         exclude "*.command"
     }
-    into createLinuxDistZip.baseName + "_${version}_java11"
+    into createLinuxDistZip.baseName + "_${version}"
 
     doLast {
         project.exec { commandLine('chmod', '775', createLinuxDistZip.archivePath) }