luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Debian releasing 

Add `deb.distribution=all;deb.component=main;deb.architecture=all`
This commit is contained in:
Eugene Yokota 2021-04-24 21:00:25 -04:00
parent 8347a0bb09
commit 8f0d258439
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
launcher-package/build.sbt
View File

@ -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") lazy val bintrayTripple = settingKey[(String, String, String)]("id, url, and pattern")
val artifactoryLinuxPattern = "[module]-[revision].[ext]" 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 bintrayGenericPattern = "[module]/[revision]/[module]/[revision]/[module]-[revision].[ext]"
val bintrayReleaseAllStaged = TaskKey[Unit]("bintray-release-all-staged", "Release all staged artifacts on bintray.") val bintrayReleaseAllStaged = TaskKey[Unit]("bintray-release-all-staged", "Release all staged artifacts on bintray.")
val windowsBuildId = settingKey[Int]("build id for Windows installer") 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. // This build creates a SBT plugin with handy features *and* bundles the SBT script for distribution.
val root = (project in file(".")). val root = (project in file(".")).
enablePlugins(UniversalPlugin, LinuxPlugin, DebianPlugin, RpmPlugin, WindowsPlugin, enablePlugins(UniversalPlugin, LinuxPlugin, DebianPlugin, RpmPlugin, WindowsPlugin,
UniversalDeployPlugin, DebianDeployPlugin, RpmDeployPlugin, WindowsDeployPlugin). UniversalDeployPlugin, RpmDeployPlugin, WindowsDeployPlugin).
settings( settings(
name := "sbt-launcher-packaging", name := "sbt-launcher-packaging",
packageName := "sbt", packageName := "sbt",
@ -201,6 +202,9 @@ val root = (project in file(".")).
addPackage(Debian, packageBin in Debian, "deb"), addPackage(Debian, packageBin in Debian, "deb"),
debianNativeBuildOptions in Debian := Seq("-Zgzip", "-z3"), debianNativeBuildOptions in Debian := Seq("-Zgzip", "-z3"),
// use the following instead of DebianDeployPlugin to skip changelog
makeDeploymentSettings(Debian, packageBin in Debian, "deb"),
// RPM SPECIFIC // RPM SPECIFIC
rpmRelease := debianBuildId.value.toString, rpmRelease := debianBuildId.value.toString,
version in Rpm := { version in Rpm := {
@ -366,8 +370,8 @@ def makePublishToForConfig(config: Configuration) = {
bintrayGenericPackagesUrl := s"https://scala.jfrog.io/artifactory/native-packages/", bintrayGenericPackagesUrl := s"https://scala.jfrog.io/artifactory/native-packages/",
bintrayTripple := { bintrayTripple := {
config.name match { config.name match {
case Debian.name if isExperimental => ("debian-experimental", bintrayDebianExperimentalUrl.value, artifactoryLinuxPattern) case Debian.name if isExperimental => ("debian-experimental", bintrayDebianExperimentalUrl.value, artifactoryDebianPattern)
case Debian.name => ("debian", bintrayDebianUrl.value, artifactoryLinuxPattern) case Debian.name => ("debian", bintrayDebianUrl.value, artifactoryDebianPattern)
case Rpm.name if isExperimental => ("rpm-experimental", bintrayRpmExperimentalUrl.value, artifactoryLinuxPattern) case Rpm.name if isExperimental => ("rpm-experimental", bintrayRpmExperimentalUrl.value, artifactoryLinuxPattern)
case Rpm.name => ("rpm", bintrayRpmUrl.value, artifactoryLinuxPattern) case Rpm.name => ("rpm", bintrayRpmUrl.value, artifactoryLinuxPattern)
} }