summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorkylo252 <[email protected]>2022-09-12 18:43:09 +0200
committerkylo252 <[email protected]>2022-09-12 18:43:09 +0200
commite4a5fe97abe500bbbe78fb137d57a59f558da05a (patch)
tree5605d7453816d2c14b75a37a6cfa2d3ba18f89ed /utils
parent824b2d1ef091f173503ebe537aef15a08085787f (diff)
parent7535f4eff9ca70dfe73db4a099d509590aa07ade (diff)
Merge remote-tracking branch 'origin/rolling'
Diffstat (limited to 'utils')
-rw-r--r--utils/ci/verify_plugins.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/ci/verify_plugins.lua b/utils/ci/verify_plugins.lua
index c56d85d1..3cc5dd82 100644
--- a/utils/ci/verify_plugins.lua
+++ b/utils/ci/verify_plugins.lua
@@ -112,7 +112,7 @@ local function verify_core_plugins(verbose)
io.write(fmt("verified [%s]\n", entry.name))
end
end
- local current_commit = result:gsub("\n", ""):gsub([[']], [[]])
+ local current_commit = result:gsub("\n", ""):gsub([[']], [[]]):sub(1, 7)
-- just in case there are some extra qutoes or it's a longer commit hash
if current_commit ~= entry.commit then
io.write(fmt("mismatch at [%s]: expected [%s], got [%s]\n", entry.name, entry.commit, current_commit))
@@ -120,7 +120,7 @@ local function verify_core_plugins(verbose)
end
end
- local handle = call_proc("git", { args = { "log", "--pretty='%h'", "-1" }, cwd = entry.path }, on_done)
+ local handle = call_proc("git", { args = { "rev-parse", "--short", "HEAD" }, cwd = entry.path }, on_done)
assert(handle)
table.insert(active_jobs, handle)
end