remove macos-10 runner label support which is no longer available

macOS 10.15 support was removed 2 years ago: https://github.blog/changelog/2022-07-20-github-actions-the-macos-10-15-actions-runner-image-is-being-deprecated-and-will-be-removed-by-8-30-22/
rhysd · May 15, 2024 · 44d144e · 44d144e
1 parent 442741a
commit 44d144e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/rule_runner_label.go b/rule_runner_label.go
@@ -12,7 +12,6 @@ const (
 	compatUbuntu2004 runnerOSCompat = 1 << iota
 	compatUbuntu2204
 	compatUbuntu2404
-	compatMacOS1015
 	compatMacOS110
 	compatMacOS120
 	compatMacOS120L
@@ -63,7 +62,6 @@ var allGitHubHostedRunnerLabels = []string{
 	"macos-12.0",
 	"macos-11",
 	"macos-11.0",
-	"macos-10.15",
 }
 
 // https://docs.github.com/en/actions/hosting-your-own-runners/using-self-hosted-runners-in-a-workflow#using-default-labels-to-route-jobs
@@ -110,14 +108,13 @@ var defaultRunnerOSCompats = map[string]runnerOSCompat{
 	"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":                  compatUbuntu2404 | compatUbuntu2204 | compatUbuntu2004, // Note: "linux" does not always indicate Ubuntu. It might be Fedora or Arch or ...
-	"macos":                  compatMacOS140 | compatMacOS140L | compatMacOS140XL | compatMacOS130 | compatMacOS130L | compatMacOS130XL | compatMacOS120 | compatMacOS120L | compatMacOS120XL | compatMacOS110 | compatMacOS1015,
+	"macos":                  compatMacOS140 | compatMacOS140L | compatMacOS140XL | compatMacOS130 | compatMacOS130L | compatMacOS130XL | compatMacOS120 | compatMacOS120L | compatMacOS120XL | compatMacOS110,
 	"windows":                compatWindows2022 | compatWindows2019 | compatWindows2016,
 }
 

diff --git a/rule_runner_label_test.go b/rule_runner_label_test.go
@@ -145,6 +145,10 @@ func TestRuleRunnerLabelCheckLabels(t *testing.T) {
 			what:   "use matrix value but no matrix exist",
 			labels: []string{"${{matrix.os}}"},
 		},
+		{
+			what:   "ubuntu-24.04",
+			labels: []string{"ubuntu-24.04"},
+		},
 		// TODO: Add tests for 'include:'
 		// TODO: Check matrix with 'include:'
 

diff --git a/testdata/err/macos_10.15_removed.out b/testdata/err/macos_10.15_removed.out
@@ -0,0 +1,2 @@
+/test\.yaml:5:14: label "macos-10\.15" is unknown\. available labels are .+ \[runner-label\]/
+/test\.yaml:9:14: label "macos-10" is unknown\. available labels are .+ \[runner-label\]/
diff --git a/testdata/err/macos_10.15_removed.yaml b/testdata/err/macos_10.15_removed.yaml
@@ -0,0 +1,11 @@
+on: push
+
+jobs:
+  macos-10-15:
+    runs-on: macos-10.15
+    steps:
+      - run: echo test
+  macos-10:
+    runs-on: macos-10
+    steps:
+      - run: echo test