Skip to content

Commit

Permalink
fixup and test [nimDocOnly]
Browse files Browse the repository at this point in the history
  • Loading branch information
timotheecour committed Apr 12, 2020
1 parent 10d49ff commit d2f09c1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
7 changes: 3 additions & 4 deletions koch.nim
Original file line number Diff line number Diff line change
Expand Up @@ -517,13 +517,12 @@ proc runCI(cmd: string) =
if isAzureCI(): installNode()

template runDocs() =
when defined(posix):
kochExecFold("Docs", "docs --git.commit:devel")
echo "runDocs"
when defined(posix): kochExecFold("Docs", "docs --git.commit:devel")

if isNimDocOnly():
echo "isNimDocOnly: true"
kochExecFold("Boot in release mode", "boot -d:release")
runDocs()
echo "isNimDocOnly: done"
return

# boot without -d:nimHasLibFFI to make sure this still works
Expand Down
9 changes: 3 additions & 6 deletions tools/continuous_integration.nim
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,12 @@ proc tryRunCmd(cmd: string): bool =
execShellCmd(cmd) == 0

proc gitLogPretty(): string =
## returns last 2 entries
runCmd "pwd && git rev-parse --show-toplevel"
runCmd "git log --no-merges -1 --pretty=oneline"
runCmd "git log --no-merges -2 --pretty=oneline"
## last commit msg excluding merge commit, so that it works both for PR's
## and direct pushes to repo
let cmd = "git log --no-merges -1 --pretty=oneline"
echo cmd
let (outp, errC) = execCmdEx(cmd)
doAssert errC == 0, $outp
echo ("gitLogPretty", outp, errC)
echo ("gitLogPretty", cmd, outp)
outp

proc isNimDocOnly*(): bool =
Expand Down

0 comments on commit d2f09c1

Please sign in to comment.