Browse Source

scripts: Fix GHA matrix job detection in cijobs.pl

The parsing is pretty brittle and it broke detecting some jobs at some
point. Also, detect if Windows is used in GHA.
Dan Fandrich 11 months ago
parent
commit
a1730b6106
1 changed files with 5 additions and 2 deletions
  1. 5 2
      scripts/cijobs.pl

+ 5 - 2
scripts/cijobs.pl

@@ -71,13 +71,16 @@ sub githubactions {
                 elsif($r =~ /macos/) {
                     $os = "macos";
                 }
+                elsif($r =~ /windows/) {
+                    $os = "windows";
+                }
 
                 # commit previously counted jobs
                 $c += $j;
                 # non-matrix job
                 $j = 1;
             }
-            elsif($_ =~ /matrix:/) {
+            elsif($_ =~ /^\s*matrix:/) {
                 # switch to matrix mode
                 $m = 0;
                 $j = 0;
@@ -125,7 +128,7 @@ sub githubactions {
                     push @cc, $1;
                     $m++;
                 }
-                elsif($_ =~ /steps:/) {
+                elsif($_ =~ /^\s*steps:/) {
                     # disable matrix mode
                     $m = -1;
                 }