macos-latest and macos-latest-xl should cause conflict

rule_runner_label.go

@@ -14,7 +14,9 @@ const (
 	compatMacOS1015
 	compatMacOS110
 	compatMacOS120
+	compatMacOS120XL
 	compatMacOS130
+	compatMacOS130XL
 	compatWindows2016
 	compatWindows2019
 	compatWindows2022
@@ -63,12 +65,12 @@ var defaultRunnerOSCompats = map[string]runnerOSCompat{
 	"ubuntu-22.04":    compatUbuntu2204,
 	"ubuntu-20.04":    compatUbuntu2004,
 	"ubuntu-18.04":    compatUbuntu1804,
-	"macos-13-xl":     compatMacOS130,
+	"macos-13-xl":     compatMacOS130XL,
 	"macos-13":        compatMacOS130,
 	"macos-13.0":      compatMacOS130,
-	"macos-latest-xl": compatMacOS120,
+	"macos-latest-xl": compatMacOS120XL,
 	"macos-latest":    compatMacOS120,
-	"macos-12-xl":     compatMacOS120,
+	"macos-12-xl":     compatMacOS120XL,
 	"macos-12":        compatMacOS120,
 	"macos-12.0":      compatMacOS120,
 	"macos-11":        compatMacOS110,
@@ -79,7 +81,7 @@ var defaultRunnerOSCompats = map[string]runnerOSCompat{
 	"windows-2019":    compatWindows2019,
 	"windows-2016":    compatWindows2016,
 	"linux":           compatUbuntu2204 | compatUbuntu2004 | compatUbuntu1804, // Note: "linux" does not always indicate Ubuntu. It might be Fedora or Arch or ...
-	"macos":           compatMacOS130 | compatMacOS120 | compatMacOS110 | compatMacOS1015,
+	"macos":           compatMacOS130 | compatMacOS130XL | compatMacOS120 | compatMacOS120XL | compatMacOS110 | compatMacOS1015,
 	"windows":         compatWindows2022 | compatWindows2019 | compatWindows2016,
 }
 

rule_runner_label_test.go

@@ -205,6 +205,11 @@ func TestRuleRunnerLabelCheckLabels(t *testing.T) {
 			labels: []string{"macos-11", "macos-12"},
 			errs:   []string{`label "macos-12" conflicts with label "macos-11"`},
 		},
+		{
+			what:   "macOS XL and normal labels conflict",
+			labels: []string{"macos-13-xl", "macos-13"},
+			errs:   []string{`label "macos-13" conflicts with label "macos-13-xl"`},
+		},
 		// TODO: Add error tests for 'include:'
 	}