mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-06-03 10:24:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Atlas: checkout latest tagged commit with atlas use (#21944)

Browse Source 
Now any deps with unspecified version reqs will checkout the last
tagged commit instead of the first commit.
This commit is contained in:
Gruruya
2023-05-28 02:57:29 -04:00
committed by GitHub
parent c2abcb06cc
commit 9cb0fcf319
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tools/atlas/atlas.nim
View File

@@ -128,6 +128,7 @@ type
GitTag = "git tag",
GitTags = "git show-ref --tags",
GitLastTaggedRef = "git rev-list --tags --max-count=1",
GitDescribe = "git describe",
GitRevParse = "git rev-parse",
GitCheckout = "git checkout",
GitPush = "git push origin",
@@ -155,7 +156,7 @@ proc exec(c: var AtlasContext; cmd: Command; args: openArray[string]): (string,
when MockupRun:
assert TestLog[c.step].cmd == cmd, $(TestLog[c.step].cmd, cmd)
case cmd
of GitDiff, GitTag, GitTags, GitLastTaggedRef, GitRevParse, GitPush, GitPull, GitCurrentCommit:
of GitDiff, GitTag, GitTags, GitLastTaggedRef, GitDescribe, GitRevParse, GitPush, GitPull, GitCurrentCommit:
result = (TestLog[c.step].output, TestLog[c.step].exitCode)
of GitCheckout:
assert args[0] == TestLog[c.step].output
@@ -252,6 +253,18 @@ proc sameVersionAs(tag, ver: string): bool =
result = safeCharAt(tag, idx-1) notin VersionChars and
safeCharAt(tag, idx+ver.len) notin VersionChars
proc gitDescribeRefTag(c: var AtlasContext; commit: string): string =
let (lt, status) = exec(c, GitDescribe, ["--tags", commit])
result = if status == 0: strutils.strip(lt) else: ""
proc getLastTaggedCommit(c: var AtlasContext): string =
let (ltr, status) = exec(c, GitLastTaggedRef, [])
if status == 0:
let lastTaggedRef = ltr.strip()
let lastTag = gitDescribeRefTag(c, lastTaggedRef)
if lastTag.len != 0:
result = lastTag
proc versionToCommit(c: var AtlasContext; d: Dependency): string =
let (outp, status) = exec(c, GitTags, [])
if status == 0:
@@ -264,7 +277,9 @@ proc versionToCommit(c: var AtlasContext; d: Dependency): string =
if commitsAndTags[1].sameVersionAs(d.commit):
return commitsAndTags[0]
of strictlyLess:
if d.commit == InvalidCommit or not commitsAndTags[1].sameVersionAs(d.commit):
if d.commit == InvalidCommit:
return getLastTaggedCommit(c)
elif not commitsAndTags[1].sameVersionAs(d.commit):
return commitsAndTags[0]
of strictlyGreater:
if commitsAndTags[1].sameVersionAs(d.commit):
@@ -322,10 +337,8 @@ proc incrementLastTag(c: var AtlasContext; field: Natural): string =
if status == 0:
let
lastTaggedRef = ltr.strip()
(lt, _) = osproc.execCmdEx("git describe --tags " & lastTaggedRef)
lastTag = lt.strip()
(cc, _) = exec(c, GitCurrentCommit, [])
currentCommit = cc.strip()
lastTag = gitDescribeRefTag(c, lastTaggedRef)
currentCommit = exec(c, GitCurrentCommit, [])[0].strip()
if lastTaggedRef == currentCommit:
info c, c.projectDir.PackageName, "the current commit '" & currentCommit & "' is already tagged '" & lastTag & "'"
@@ -718,7 +731,7 @@ proc patchNimbleFile(c: var AtlasContext; dep: string): string =
break
if not found:
let line = "requires \"$1#head\"\n" % dep.escape("", "")
let line = "requires \"$1\"\n" % dep.escape("", "")
if result.len > 0:
let oldContent = readFile(result)
writeFile result, oldContent & "\n" & line