From: Dan Fandrich <dan@coneharvesters.com>
Date: Mon, 1 May 2023 18:57:54 +0000 (-0700)
Subject: scripts: Fix GHA matrix job detection in cijobs.pl
X-Git-Tag: curl-8_2_0~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1730b610660bcd076b25e24269cc8e7f2c19f2b;p=thirdparty%2Fcurl.git

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.
---

diff --git a/scripts/cijobs.pl b/scripts/cijobs.pl
index 21c750d6d4..a73b3f5bf5 100755
--- a/scripts/cijobs.pl
+++ b/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;
                 }