Skip to content

Commit

Permalink
Bumping version to 0.0.26
Browse files Browse the repository at this point in the history
  • Loading branch information
forki committed Oct 5, 2018
1 parent 57817a0 commit 92195d0
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Release Notes

## 0.0.25 - 2018-10-05
## 0.0.26 - 2018-10-05

* Initial release
5 changes: 4 additions & 1 deletion build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ Target.create "BundleClient" (fun _ ->

!! (piServerPath </> "*.js") |> Shell.copyFiles piDeployDir
let targetNodeModules = piDeployDir </> "node_modules"
Shell.cleanDirs [targetNodeModules]
let audioTarget = deployDir </> "audio"
Shell.cleanDirs [targetNodeModules; audioTarget]
Shell.copyRecursive (piServerPath </> "node_modules") targetNodeModules true |> ignore

System.IO.Compression.ZipFile.CreateFromDirectory(piDeployDir, currentFirmware)
Expand All @@ -171,6 +172,8 @@ Target.create "BundleClient" (fun _ ->
let jsDir = clientDir </> "js"
let imageDir = clientDir </> "Images"

Shell.copyRecursive "audio" audioTarget true |> ignore
Directory.delete (audioTarget </> "custom")
!! "src/Client/public/**/*.*" |> Shell.copyFiles publicDir
!! "src/Client/js/**/*.*" |> Shell.copyFiles jsDir
!! "src/Client/Images/**/*.*" |> Shell.copyFiles imageDir
Expand Down
4 changes: 2 additions & 2 deletions src/Client/ReleaseNotes.fs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module internal ReleaseNotes

let Version = "0.0.25"
let Version = "0.0.26"

let IsPrerelease = false

let Notes = """
# Release Notes
## 0.0.25 - 2018-10-05
## 0.0.26 - 2018-10-05
* Initial release
"""
6 changes: 4 additions & 2 deletions src/PiServer/PiServer.fs
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ let stop (nodeServices : INodeServices) = task {
return r
}

let mutable currentTask = null

let executeAction (nodeServices : INodeServices) (action:TagAction) =
match action with
| TagAction.UnknownTag ->
Expand All @@ -59,8 +61,8 @@ let executeAction (nodeServices : INodeServices) (action:TagAction) =
}
| TagAction.PlayMusik url ->
task {
let! _ = stop nodeServices
play nodeServices url |> ignore
let! r = stop nodeServices
currentTask <- play nodeServices url
return (sprintf "Playing %s" url)
}

Expand Down

0 comments on commit 92195d0

Please sign in to comment.