jdb/strawboss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework build configuration to take advantage of new built-in docker build capabilities.

Browse Source
This commit is contained in:
Jonathan Bernard 2018-12-23 17:39:04 -06:00
parent e61fe3b01e
commit 52eaa63f25
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/nim/strawboss.nim
View File

@ -3,8 +3,7 @@ import cliutils, docopt, os, sequtils, strutils, tempfile, uuids
import strawbosspkg/configuration
import strawbosspkg/core
import strawbosspkg/server
let SB_VER = "0.5.0"
import strawbosspkg/version
proc logProcOutput*(outMsg, errMsg: TaintedString, cmd: string) =
let prefix = if cmd.len > 0: cmd & ": " else: ""
@ -26,7 +25,7 @@ Options
(strawboss.config.json).
"""
let args = docopt(doc, version = "strawboss v" & SB_VER)
let args = docopt(doc, version = "strawboss v" & SB_VERSION)
let cfgFile = if args["--config-file"]: $args["--config-file"]
else: "strawboss.config.json"

6
src/main/nim/strawbosspkg/server.nim
View File

@ -7,7 +7,7 @@ from asyncnet import send
from re import re, find
from timeutils import trimNanoSec
import ./configuration, ./core
import ./configuration, ./core, ./version
type
Session = object
@ -166,8 +166,8 @@ proc start*(cfg: StrawBossConfig): void =
routes:
get "/ping":
resp($(%"pong"), JSON)
get "/version":
resp($(%("strawboss v" & SB_VERSION)), JSON)
post "/auth-token":
var uname, pwd: string

2
src/main/nim/strawbosspkg/version.nim Normal file
View File

@ -0,0 +1,2 @@
const SB_VERSION* = "0.5.0"

16
strawboss.projectdef.json
View File

@ -1,24 +1,26 @@
{
"name": "strawboss",
"containerImage": "nimlang/nim:0.19.0",
"steps": {
"compile": {
"artifacts": ["strawboss"],
"stepCmd": "docker run -v `pwd`:/usr/src/strawboss -w /usr/src/strawboss jdbernard/nim:0.17.2 nimble install"
"containerImage": "nimlang/nim:0.19.0",
"stepCmd": "nimble build"
},
"unittest": {
"depends": ["compile"],
"stepCmd": "docker run -v `pwd`:/usr/src/strawboss -v $compile_DIR:/usr/build/strawboss -w /usr/src/strawboss -i jdbernard/nim:0.17.2 /bin/bash",
"stepCmd": "/bin/bash",
"cmdInput": [
"cp /usr/build/strawboss/strawboss .",
"cp $compile_DIR/strawboss .",
"nimble install --depsOnly",
"nim c -r src/test/nim/run_unit_tests"
]
},
"functest": {
"depends": ["compile"],
"stepCmd": "docker run -v `pwd`:/usr/src/strawboss -v $compile_DIR:/usr/build/strawboss -w /usr/src/strawboss -i jdbernard/nim:0.17.2 /bin/bash",
"stepCmd": "/bin/bash",
"cmdInput": [
"cp /usr/build/strawboss/strawboss .",
"cp $compile_DIR/strawboss .",
"nimble install --depsOnly",
"nim c -r src/test/nim/run_functional_tests"
]
@ -26,9 +28,9 @@
"build": {
"artifacts": ["strawboss-$VERSION.zip"],
"depends": ["compile", "unittest", "functest"],
"stepCmd": "docker run -v `pwd`:/usr/src/strawboss -v $compile_DIR:/usr/build/strawboss -w /usr/src/strawboss -i jdbernard/nim:0.17.2 /bin/bash",
"stepCmd": "/bin/bash",
"cmdInput": [
"cp /usr/build/strawboss/strawboss .",
"cp $compile_DIR/strawboss .",
"zip strawboss-$VERSION.zip strawboss strawboss.config.json example.json src/main/systemd/strawboss.service"
]
}