This commit is contained in:
Daylin Morgan 2024-09-11 15:03:44 -05:00
parent 09c2d08540
commit 16ff586de4
Signed by: daylin
GPG key ID: 950D13E9719334AD
4 changed files with 25 additions and 31 deletions

View file

@ -23,22 +23,19 @@ proc initContext*(): OizysContext =
result.ci = getEnv("GITHUB_STEP_SUMMARY") != ""
var oc = initContext()
proc checkPath(s: string): string =
## fail if path doesn't exist
if not s.dirExists:
errorQuit fmt"flake path: {s} does not exist"
if not s.dirExists: fatalQuit fmt"flake path: {s} does not exist"
s
# public api -------------------------------------
proc updateContext*(
host: seq[string],
flake: string,
debug: bool,
resetCache: bool
) =
if host.len > 0:
oc.hosts = host
if host.len > 0: oc.hosts = host
oc.debug = debug
oc.resetCache = resetCache
if flake != "":
@ -49,9 +46,9 @@ proc updateContext*(
debug bb(fmt"""[b]flake[/]: {oc.flake}, [b]hosts[/]: {oc.hosts.join(" ")}""")
proc getHosts*(): seq[string] = return oc.hosts
proc getFlake*(): string = return oc.flake
proc isDebug*(): bool = return oc.debug
proc isResetCache*(): bool = return oc.resetCache
proc isCi*(): bool = return oc.ci
proc getFlake*(): string = return oc.flake
proc isDebug*(): bool = return oc.debug
proc isResetCache*(): bool = return oc.resetCache
proc isCi*(): bool = return oc.ci

View file

@ -32,12 +32,12 @@ proc runCmdCapt*(
args = args[1..^1],
options = {poUsePath}
)
# NOTE: if I didn't use streams could I just read from the file handle instead?
let
outstrm = peekableOutputStream p
errstrm = peekableErrorStream p
result.exitCode = -1
var line: string
# var cnt: int
while true:
if CaptStdout in capture:
if outstrm.readLine(line):
@ -48,9 +48,6 @@ proc runCmdCapt*(
result.exitCode = peekExitCode(p)
if result.exitCode != -1: break
# result.exitCode = waitForExit p
# result.exitCode = waitForExit p
# close p
close p
proc runCmdCaptWithSpinner*(

View file

@ -10,9 +10,9 @@ when defined(amd64) and (defined(gcc) or defined(clang)):
template withTmpDir(body: untyped): untyped =
let tmpDir {.inject.} = createTempDir("oizys","")
body
removeDir(tmpDir)
removeDir tmpDir
var ghToken = getEnv("GITHUB_TOKEN")
var ghToken = getEnv "GITHUB_TOKEN"
proc checkToken() {.inline.} =
if ghToken == "": fatalQuit "GITHUB_TOKEN not set"
@ -50,7 +50,8 @@ proc postGhApi(url: string, body: JsonNode) =
let response = client.post(url, body = $body)
info fmt"Status: {response.code}"
except:
error "failed to get response code"
errorQuit "failed to get response code"
proc createDispatch*(workflowFileName: string, `ref`: string) =
## https://docs.github.com/en/rest/actions/workflows?apiVersion=2022-11-28#create-a-workflow-dispatch-event
@ -174,7 +175,7 @@ proc fetch(r: GitRepo) =
checkGit code
proc status(r: GitRepo) =
let (output, _, code) = runCmdCapt(r.git("status", "--porcelain"))
let (output, _, code) = runCmdCapt r.git("status", "--porcelain")
checkGit code
if output.len > 0:
info "unstaged commits, cowardly exiting..."
@ -188,6 +189,4 @@ proc rebase(r: GitRepo, `ref`: string) =
proc updateRepo*() =
let repo = GitRepo(path: getFlake())
fetch repo
rebase repo, "origin/flake-lock"
rebase(repo, "origin/flake-lock")

View file

@ -2,8 +2,7 @@ import std/macros
type
OverlayKind = enum
oPre
oPost
oPre, oPost
OverlayProc = object
node: NimNode
kind: OverlayKind
@ -27,6 +26,7 @@ proc applyOverlay(child: NimNode, overlayProc: OverlayProc) =
macro overlay*(x: untyped): untyped =
##[
apply pre and post operations to procs:
```nim
overlay:
proc pre(a: bool) =
@ -43,7 +43,8 @@ macro overlay*(x: untyped): untyped =
echo "inside mine"
echo "after"
```
]##
]##
result = newStmtList()
var overlays: seq[OverlayProc]
for child in x.children():