Merge pull request #12 from oscar-system/enh/matchingininclude

enh: allow '<matching>' in include statements

Project.toml

@@ -1,7 +1,7 @@
 name = "OscarDevTools"
 uuid = "4f01c588-2833-446a-9dbd-6331d80acb41"
 authors = ["Benjamin Lorenz <[email protected]>"]
-version = "0.2.1"
+version = "0.2.2"
 
 [deps]
 GitHub = "bc5e4493-9b4d-5f90-b8aa-2b2bcaad7a26"

src/OscarCI.jl

@@ -191,7 +191,7 @@ function ci_matrix(meta::Dict{String,Any}; pr=0, fork=nothing, active_repo=nothi
                push!(namestr_branches,"$pkgname#$pkg_branch")
                if !isnothing(pkg_fork)
                   branchdicts[end]["pkgs"][pkgname]["branch"] = "$url#$pkg_branch"
-                  namestr_branches[end] = "$pkgname#$pkg_fork#$pkg_branch"
+                  namestr_branches[end] = "$pkgname@$pkg_fork#$pkg_branch"
                   branchfound = true
                elseif pkg_branch != "master"
                   branchdicts[end]["pkgs"][pkgname]["branch"] = "$pkg_branch"
@@ -222,6 +222,10 @@ function ci_matrix(meta::Dict{String,Any}; pr=0, fork=nothing, active_repo=nothi
             if key in ("os","julia-version")
                named_include[key] = val
             else
+               if val == "<matching>"
+                  (url, branch, _) = find_branch(key, pr_branch; fork=fork)
+                  val = "$url#$branch"
+               end
                named_include[key] = Dict{String,Any}(
                                                      "name" => "$(pkg_parsebranch(key,val)[3])",
                                                      "branch" => val

test/meta/OscarCI.toml

@@ -16,17 +16,18 @@ title = "metadata for oscar CI run"
   testoptions = []
 
   [pkgs.Singular]
-  test = false
+  branches = []
+  test = true
   testoptions = []
 
   [pkgs.Polymake]
-  branches = [ "master" ]
+  branches = [ "release" ]
   test = false
   testoptions = []
 
 [include]
   [include.macos]
-  Nemo = "master"
+  Singular = "<matching>"
   os = "macos-latest"
   julia-version = "~1.6.0-0"