diff --git a/core/rules/rule_runner_label.go b/core/rules/rule_runner_label.go index 3a9d6da..ccf5f33 100644 --- a/core/rules/rule_runner_label.go +++ b/core/rules/rule_runner_label.go @@ -42,8 +42,7 @@ const ( compatInvalid = 0 compatUbuntu2004 runnerOSCompat = 1 << iota compatUbuntu2204 - compatMacOS1015 - compatMacOS110 + compatUbuntu2404 compatMacOS120 compatMacOS120L compatMacOS120XL @@ -53,7 +52,9 @@ const ( compatMacOS140 compatMacOS140L compatMacOS140XL - compatWindows2016 + compatMacOS150 + compatMacOS150L + compatMacOS150XL compatWindows2019 compatWindows2022 ) @@ -93,38 +94,35 @@ var defaultRunnerOSCompats = map[string]runnerOSCompat{ "ubuntu-latest-4-cores": compatUbuntu2204, "ubuntu-latest-8-cores": compatUbuntu2204, "ubuntu-latest-16-cores": compatUbuntu2204, + "ubuntu-24.04": compatUbuntu2404, "ubuntu-22.04": compatUbuntu2204, "ubuntu-20.04": compatUbuntu2004, + "macos-latest-xl": compatMacOS140XL, + "macos-latest-xlarge": compatMacOS140XL, + "macos-latest-large": compatMacOS140L, + "macos-latest": compatMacOS140, + "macos-15-xlarge": compatMacOS150XL, + "macos-15-large": compatMacOS150L, + "macos-15": compatMacOS150, "macos-14-xl": compatMacOS140XL, "macos-14-xlarge": compatMacOS140XL, "macos-14-large": compatMacOS140L, "macos-14": compatMacOS140, - "macos-14.0": compatMacOS140, "macos-13-xl": compatMacOS130XL, "macos-13-xlarge": compatMacOS130XL, "macos-13-large": compatMacOS130L, "macos-13": compatMacOS130, - "macos-13.0": compatMacOS130, - "macos-latest-xl": compatMacOS120XL, - "macos-latest-xlarge": compatMacOS120XL, - "macos-latest-large": compatMacOS120L, - "macos-latest": compatMacOS120, "macos-12-xl": compatMacOS120XL, "macos-12-xlarge": compatMacOS120XL, "macos-12-large": compatMacOS120L, "macos-12": compatMacOS120, - "macos-12.0": compatMacOS120, - "macos-11": compatMacOS110, - "macos-11.0": compatMacOS110, - "macos-10.15": compatMacOS1015, "windows-latest": compatWindows2022, "windows-latest-8-cores": compatWindows2022, "windows-2022": compatWindows2022, "windows-2019": compatWindows2019, - "windows-2016": compatWindows2016, - "linux": compatUbuntu2204 | compatUbuntu2004, // Note: "linux" does not always indicate Ubuntu. It might be Fedora or Arch or ... - "macos": compatMacOS130 | compatMacOS130L | compatMacOS130XL | compatMacOS120 | compatMacOS120L | compatMacOS120XL | compatMacOS110 | compatMacOS1015, - "windows": compatWindows2022 | compatWindows2019 | compatWindows2016, + "linux": compatUbuntu2404 | compatUbuntu2204 | compatUbuntu2004, // Note: "linux" does not always indicate Ubuntu. It might be Fedora or Arch or ... + "macos": compatMacOS150 | compatMacOS150L | compatMacOS150XL | compatMacOS140 | compatMacOS140L | compatMacOS140XL | compatMacOS130 | compatMacOS130L | compatMacOS130XL | compatMacOS120 | compatMacOS120L | compatMacOS120XL, + "windows": compatWindows2022 | compatWindows2019, } var knownLabels = []string{