Skip to content

Commit

Permalink
Try to release
Browse files Browse the repository at this point in the history
  • Loading branch information
malliina committed Nov 19, 2023
1 parent 0a11b90 commit 50419af
Show file tree
Hide file tree
Showing 56 changed files with 22 additions and 2,979 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test
name: Package and release

on: push

Expand All @@ -16,7 +16,13 @@ jobs:
cache: sbt
- name: Compile
run: sbt Test/compile
- name: Build deb package
- name: Build deb packages
run: |
sudo apt-get install -y lintian
sbt "set scalaJSStage in Global := FullOptStage" musicpimp/ciBuild musicmeta/ciBuild pimpcloud/ciBuild
sbt "set scalaJSStage in Global := FullOptStage" musicpimp/Debian/packageBin pimpcloud/Debian/packageBin
- name: Release .deb packages
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/v')
with:
files: |
*/*.deb
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ This is the MusicPimp server software for Windows/Linux desktops. Check [www.mus

- [musicpimp](musicpimp) as a standalone app
- [pimpbeam](pimpbeam) deployed to [beam.musicpimp.org](https://beam.musicpimp.org)
- [musicmeta](musicmeta) deployed to [api.musicpimp.org](https://api.musicpimp.org)
- [pimpcloud](pimpcloud) deployed to [cloud.musicpimp.org](https://cloud.musicpimp.org)

## Development
Expand Down
76 changes: 9 additions & 67 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import java.nio.file.{Files, Path, Paths, StandardCopyOption}
import com.malliina.appbundler.FileMapping
import com.malliina.sbt.GenericKeys._
import com.malliina.sbt.filetree.DirMap
import com.malliina.filetree.DirMap
import com.malliina.sbt.mac.MacKeys._
import com.malliina.sbt.mac.MacPlugin.{Mac, macSettings}
import com.malliina.sbt.unix.LinuxKeys.{appHome, ciBuild, httpPort, httpsPort}
import com.malliina.sbt.unix.LinuxKeys.{ciBuild, httpPort, httpsPort}
import com.malliina.sbt.unix.{LinuxPlugin => LinusPlugin}
import com.malliina.sbt.win.WinKeys.{minJavaVersion, msiMappings, useTerminateProcess, winSwExe}
import com.malliina.sbt.win.{WinKeys, WinPlugin}
Expand Down Expand Up @@ -158,67 +158,6 @@ val it = project
)
)

val metaCommonSettings = Seq(
version := "1.12.0",
scalacOptions := Seq("-unchecked", "-deprecation")
)
val musicmetaFrontend = scalajsProject("musicmeta-frontend", file("musicmeta") / "frontend")
.settings(metaCommonSettings)
.settings(
libraryDependencies ++= Seq(
"com.lihaoyi" %%% "scalatags" % scalaTagsVersion,
"be.doeraene" %%% "scalajs-jquery" % "1.0.0",
"com.typesafe.play" %%% "play-json" % playJsonVersion,
"com.malliina" %%% "primitives" % primitivesVersion
),
Compile / npmDependencies ++= Seq("jquery" -> "3.3.1")
)
val musicmeta = project
.in(file("musicmeta"))
.enablePlugins(
PlayScala,
JavaServerAppPackaging,
SystemdPlugin,
BuildInfoPlugin,
FileTreePlugin,
WebScalaJSBundlerPlugin
)
.settings(serverSettings ++ metaCommonSettings)
.settings(
scalaJSProjects := Seq(musicmetaFrontend),
Assets / pipelineStages := Seq(scalaJSPipeline),
libraryDependencies ++= Seq(
"commons-codec" % "commons-codec" % "1.15",
logstreamsDep,
malliinaGroup %% "play-social" % utilPlayVersion,
utilPlayDep,
utilPlayDep % Test classifier "tests"
),
Linux / httpPort := Option("disabled"),
Linux / httpsPort := Option("8460"),
maintainer := "Michael Skogberg <[email protected]>",
Universal / javaOptions ++= {
val linuxName = (Linux / name).value
val metaHome = (Linux / appHome).value
Seq(
s"-Ddiscogs.oauth=/etc/$linuxName/discogs-oauth.key",
s"-Dgoogle.oauth=/etc/$linuxName/google-oauth.key",
s"-Dcover.dir=$metaHome/covers",
s"-Dconfig.file=/etc/$linuxName/production.conf",
s"-Dlogger.file=/etc/$linuxName/logback-prod.xml",
"-Dfile.encoding=UTF-8",
"-Dsun.jnu.encoding=UTF-8",
s"-Dpidfile.path=/dev/null",
)
},
pipelineStages := Seq(digest, gzip),
buildInfoKeys ++= Seq[BuildInfoKey](
"frontName" -> (musicmetaFrontend / name).value
),
buildInfoPackage := "com.malliina.musicmeta",
linuxPackageSymlinks := linuxPackageSymlinks.value.filterNot(_.link == "/usr/bin/starter")
)

val pimpbeam = project
.in(file("pimpbeam"))
.enablePlugins(
Expand Down Expand Up @@ -251,7 +190,7 @@ val pimpbeam = project
buildInfoPackage := "com.malliina.beam"
)

val pimp = project.in(file(".")).aggregate(musicpimp, pimpcloud, musicmeta, pimpbeam)
val pimp = project.in(file(".")).aggregate(musicpimp, pimpcloud, pimpbeam)

addCommandAlias("pimp", ";project musicpimp")
addCommandAlias("cloud", ";project pimpcloud")
Expand Down Expand Up @@ -291,11 +230,14 @@ lazy val pimpPlaySettings =
),
fileTreeSources := Seq(
DirMap(
(Assets / resourceDirectory).value,
(Assets / resourceDirectory).value.toPath,
"com.malliina.musicpimp.assets.AppAssets",
"com.malliina.musicpimp.html.PimpHtml.at"
),
DirMap((Compile / resourceDirectory).value, "com.malliina.musicpimp.licenses.LicenseFiles")
DirMap(
(Compile / resourceDirectory).value.toPath,
"com.malliina.musicpimp.licenses.LicenseFiles"
)
),
libs := libs.value.filter { lib =>
!lib.toFile.getAbsolutePath
Expand Down Expand Up @@ -419,7 +361,7 @@ lazy val pimpcloudSettings =
PlayKeys.externalizeResources := false,
fileTreeSources := Seq(
DirMap(
(Assets / resourceDirectory).value,
(Assets / resourceDirectory).value.toPath,
"com.malliina.pimpcloud.assets.CloudAssets",
"controllers.pimpcloud.CloudTags.at"
)
Expand Down
18 changes: 0 additions & 18 deletions musicmeta/README.md

This file was deleted.

7 changes: 0 additions & 7 deletions musicmeta/app/com/malliina/concurrent/Execution.scala

This file was deleted.

154 changes: 0 additions & 154 deletions musicmeta/app/com/malliina/http/DiscoClient.scala

This file was deleted.

5 changes: 0 additions & 5 deletions musicmeta/app/com/malliina/http/exceptions.scala

This file was deleted.

15 changes: 0 additions & 15 deletions musicmeta/app/com/malliina/http/models.scala

This file was deleted.

Loading

0 comments on commit 50419af

Please sign in to comment.