From 8f0d2584390507ae8d38b2087d599cb22d15ccea Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 24 Apr 2021 21:00:25 -0400 Subject: [PATCH] Fix Debian releasing Add `deb.distribution=all;deb.component=main;deb.architecture=all` --- launcher-package/build.sbt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/launcher-package/build.sbt b/launcher-package/build.sbt index dee410f93..a4690d361 100755 --- a/launcher-package/build.sbt +++ b/launcher-package/build.sbt @@ -61,6 +61,7 @@ lazy val bintrayGenericPackagesUrl = settingKey[String]("API point for generic p lazy val bintrayTripple = settingKey[(String, String, String)]("id, url, and pattern") val artifactoryLinuxPattern = "[module]-[revision].[ext]" +val artifactoryDebianPattern = "[module]-[revision].[ext];deb.distribution=all;deb.component=main;deb.architecture=all" val bintrayGenericPattern = "[module]/[revision]/[module]/[revision]/[module]-[revision].[ext]" val bintrayReleaseAllStaged = TaskKey[Unit]("bintray-release-all-staged", "Release all staged artifacts on bintray.") val windowsBuildId = settingKey[Int]("build id for Windows installer") @@ -82,7 +83,7 @@ version in ThisBuild := "0.1.0" // This build creates a SBT plugin with handy features *and* bundles the SBT script for distribution. val root = (project in file(".")). enablePlugins(UniversalPlugin, LinuxPlugin, DebianPlugin, RpmPlugin, WindowsPlugin, - UniversalDeployPlugin, DebianDeployPlugin, RpmDeployPlugin, WindowsDeployPlugin). + UniversalDeployPlugin, RpmDeployPlugin, WindowsDeployPlugin). settings( name := "sbt-launcher-packaging", packageName := "sbt", @@ -201,6 +202,9 @@ val root = (project in file(".")). addPackage(Debian, packageBin in Debian, "deb"), debianNativeBuildOptions in Debian := Seq("-Zgzip", "-z3"), + // use the following instead of DebianDeployPlugin to skip changelog + makeDeploymentSettings(Debian, packageBin in Debian, "deb"), + // RPM SPECIFIC rpmRelease := debianBuildId.value.toString, version in Rpm := { @@ -366,8 +370,8 @@ def makePublishToForConfig(config: Configuration) = { bintrayGenericPackagesUrl := s"https://scala.jfrog.io/artifactory/native-packages/", bintrayTripple := { config.name match { - case Debian.name if isExperimental => ("debian-experimental", bintrayDebianExperimentalUrl.value, artifactoryLinuxPattern) - case Debian.name => ("debian", bintrayDebianUrl.value, artifactoryLinuxPattern) + case Debian.name if isExperimental => ("debian-experimental", bintrayDebianExperimentalUrl.value, artifactoryDebianPattern) + case Debian.name => ("debian", bintrayDebianUrl.value, artifactoryDebianPattern) case Rpm.name if isExperimental => ("rpm-experimental", bintrayRpmExperimentalUrl.value, artifactoryLinuxPattern) case Rpm.name => ("rpm", bintrayRpmUrl.value, artifactoryLinuxPattern) }