From 52fca628be83b6ec2dcd4bd632b77b882492e6ae Mon Sep 17 00:00:00 2001 From: Yukai Chou Date: Wed, 16 Oct 2024 21:52:18 +0800 Subject: [PATCH] Use buildAllGitHubHostedRunnerLabels() to build allGitHubHostedRunnerLabels --- rule_runner_label.go | 39 +++++---------------------------------- 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/rule_runner_label.go b/rule_runner_label.go index bed1f8b7b..48124e9cc 100644 --- a/rule_runner_label.go +++ b/rule_runner_label.go @@ -2,6 +2,7 @@ package actionlint import ( "path" + "slices" "sort" "strings" ) @@ -32,45 +33,15 @@ const ( func buildAllGitHubHostedRunnerLabels() []string { l := make([]string, 0, len(defaultRunnerOSCompats)) for k := range defaultRunnerOSCompats { - l = append(l, k) + if !slices.Contains(selfHostedRunnerPresetOSLabels, k) { + l = append(l, k) + } } sort.Strings(l) return l } -// https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners -var allGitHubHostedRunnerLabels = []string{ - "windows-latest", - "windows-latest-8-cores", - "windows-2022", - "windows-2019", - "ubuntu-latest", - "ubuntu-latest-4-cores", - "ubuntu-latest-8-cores", - "ubuntu-latest-16-cores", - "ubuntu-24.04", - "ubuntu-22.04", - "ubuntu-20.04", - "macos-latest", - "macos-latest-xl", - "macos-latest-xlarge", - "macos-latest-large", - "macos-15-xlarge", - "macos-15-large", - "macos-15", - "macos-14-xl", - "macos-14-xlarge", - "macos-14-large", - "macos-14", - "macos-13-xl", - "macos-13-xlarge", - "macos-13-large", - "macos-13", - "macos-12-xl", - "macos-12-xlarge", - "macos-12-large", - "macos-12", -} +var allGitHubHostedRunnerLabels = buildAllGitHubHostedRunnerLabels() // https://docs.github.com/en/actions/hosting-your-own-runners/using-self-hosted-runners-in-a-workflow#using-default-labels-to-route-jobs var selfHostedRunnerPresetOSLabels = []string{