Skip to content

Commit 8afe386

Browse files
Copilothenrymercer
andcommitted
Use runnerSize property instead of runnerImages for better compatibility
Co-authored-by: henrymercer <[email protected]>
1 parent cbbc19b commit 8afe386

File tree

4 files changed

+16
-20
lines changed

4 files changed

+16
-20
lines changed

pr-checks/checks/cleanup-db-cluster-dir.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: "Clean up database cluster directory"
22
description: "The database cluster directory is cleaned up if it is not empty."
33
versions: ["linked"]
4-
runnerImages: ["ubuntu-slim"]
4+
runnerSize: "slim"
55
steps:
66
- name: Add a file to the database cluster directory
77
run: |

pr-checks/checks/config-input.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: "Config input"
22
description: "Tests specifying configuration using the config input"
33
installNode: true
44
versions: ["linked"]
5-
runnerImages: ["ubuntu-slim"]
5+
runnerSize: "slim"
66
steps:
77
- name: Copy queries into workspace
88
run: |

pr-checks/checks/language-aliases.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: "Language aliases"
22
description: "Tests that language aliases are resolved correctly"
33
versions: ["linked"]
4-
runnerImages: ["ubuntu-slim"]
4+
runnerSize: "slim"
55
steps:
66
- uses: ./../action/init
77
with:

pr-checks/sync.py

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -76,25 +76,21 @@ def writeHeader(checkStream):
7676
if version == "latest":
7777
raise ValueError('Did not recognize "version: latest". Did you mean "version: linked"?')
7878

79-
# Check if a specific runner image is specified in the check
80-
customRunnerImages = checkSpecification.get('runnerImages')
81-
if customRunnerImages:
82-
# Use custom runner images specified in the check
83-
runnerImages = customRunnerImages
84-
else:
85-
# Use default runner images based on operating systems
86-
runnerImages = ["ubuntu-latest", "macos-latest", "windows-latest"]
87-
79+
# Determine runner size (default is "latest")
80+
# "default" maps to "latest" for the runner image name
81+
runnerSize = checkSpecification.get('runnerSize', 'default')
82+
actualRunnerSize = 'latest' if runnerSize == 'default' else runnerSize
83+
84+
# Build runner images based on runner size and operating systems
8885
operatingSystems = checkSpecification.get('operatingSystems', ["ubuntu"])
89-
86+
9087
for operatingSystem in operatingSystems:
91-
runnerImagesForOs = [image for image in runnerImages if image.startswith(operatingSystem)]
92-
93-
for runnerImage in runnerImagesForOs:
94-
matrix.append({
95-
'os': runnerImage,
96-
'version': version
97-
})
88+
# Construct the runner image name: {os}-{size}
89+
runnerImage = f"{operatingSystem}-{actualRunnerSize}"
90+
matrix.append({
91+
'os': runnerImage,
92+
'version': version
93+
})
9894

9995
useAllPlatformBundle = "false" # Default to false
10096
if checkSpecification.get('useAllPlatformBundle'):

0 commit comments

Comments
 (0)