Kaynağa Gözat

script: improve test.lua (#8703)

* improve pkg detection

* comment out ospp lock_pkg func

* use plain matching
Willaaaaaaa 2 hafta önce
ebeveyn
işleme
610ef5dd0f
1 değiştirilmiş dosya ile 15 ekleme ve 13 silme
  1. 15 13
      scripts/test.lua

+ 15 - 13
scripts/test.lua

@@ -272,18 +272,20 @@ function get_modified_packages()
                 local package = file:match("packages/%w/(%S-)/")
                 table.insert(packages, package)
             end
-        elseif line:startswith("+") and line:find("add_versions") then
-            local version = line:match("add_versions%(\"(.-)\"")
-            if version:find(":", 1, true) then
-                version = version:split(":")[2]
-            end
-            if #packages > 0 and version then
-                local lastpackage = packages[#packages]
-                local splitinfo = lastpackage:split("%s+")
-                if #splitinfo > 1 then
-                    table.insert(packages, splitinfo[1] .. " " .. version)
-                else
-                    packages[#packages] = splitinfo[1] .. " " .. version
+        elseif line:startswith("+") and (line:find("add_versions", 1, true) or line:find("package:add(\"versions\"", 1, true)) then
+            local version = line:match("add_versions%(\"(.-)\"") or line:match("package:add%(\"versions\",%s*\"(.-)\"")
+            if version then
+                if version:find(":", 1, true) then
+                    version = version:split(":")[2]
+                end
+                if #packages > 0 and version then
+                    local lastpackage = packages[#packages]
+                    local splitinfo = lastpackage:split("%s+")
+                    if #splitinfo > 1 then
+                        table.insert(packages, splitinfo[1] .. " " .. version)
+                    else
+                        packages[#packages] = splitinfo[1] .. " " .. version
+                    end
                 end
             end
         end
@@ -366,7 +368,7 @@ function main(...)
     end
 
     -- lock packages
-    _lock_packages(packages)
+    -- _lock_packages(packages)
 
     -- require packages
     _require_packages(argv, packages)