From 8afe386a9f546fbd7bbf37ea91dbff28becc3751 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 30 Oct 2025 11:04:45 +0000 Subject: [PATCH] Use runnerSize property instead of runnerImages for better compatibility Co-authored-by: henrymercer <14129055+henrymercer@users.noreply.github.com> --- pr-checks/checks/cleanup-db-cluster-dir.yml | 2 +- pr-checks/checks/config-input.yml | 2 +- pr-checks/checks/language-aliases.yml | 2 +- pr-checks/sync.py | 30 +++++++++------------ 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/pr-checks/checks/cleanup-db-cluster-dir.yml b/pr-checks/checks/cleanup-db-cluster-dir.yml index 9cb3dfa05..f2052cd7c 100644 --- a/pr-checks/checks/cleanup-db-cluster-dir.yml +++ b/pr-checks/checks/cleanup-db-cluster-dir.yml @@ -1,7 +1,7 @@ name: "Clean up database cluster directory" description: "The database cluster directory is cleaned up if it is not empty." versions: ["linked"] -runnerImages: ["ubuntu-slim"] +runnerSize: "slim" steps: - name: Add a file to the database cluster directory run: | diff --git a/pr-checks/checks/config-input.yml b/pr-checks/checks/config-input.yml index 7253e443e..8721f4de4 100644 --- a/pr-checks/checks/config-input.yml +++ b/pr-checks/checks/config-input.yml @@ -2,7 +2,7 @@ name: "Config input" description: "Tests specifying configuration using the config input" installNode: true versions: ["linked"] -runnerImages: ["ubuntu-slim"] +runnerSize: "slim" steps: - name: Copy queries into workspace run: | diff --git a/pr-checks/checks/language-aliases.yml b/pr-checks/checks/language-aliases.yml index a5654fc88..5dca1b46f 100644 --- a/pr-checks/checks/language-aliases.yml +++ b/pr-checks/checks/language-aliases.yml @@ -1,7 +1,7 @@ name: "Language aliases" description: "Tests that language aliases are resolved correctly" versions: ["linked"] -runnerImages: ["ubuntu-slim"] +runnerSize: "slim" steps: - uses: ./../action/init with: diff --git a/pr-checks/sync.py b/pr-checks/sync.py index f44ffb964..d0725eaee 100755 --- a/pr-checks/sync.py +++ b/pr-checks/sync.py @@ -76,25 +76,21 @@ for file in sorted((this_dir / 'checks').glob('*.yml')): if version == "latest": raise ValueError('Did not recognize "version: latest". Did you mean "version: linked"?') - # Check if a specific runner image is specified in the check - customRunnerImages = checkSpecification.get('runnerImages') - if customRunnerImages: - # Use custom runner images specified in the check - runnerImages = customRunnerImages - else: - # Use default runner images based on operating systems - runnerImages = ["ubuntu-latest", "macos-latest", "windows-latest"] - + # Determine runner size (default is "latest") + # "default" maps to "latest" for the runner image name + runnerSize = checkSpecification.get('runnerSize', 'default') + actualRunnerSize = 'latest' if runnerSize == 'default' else runnerSize + + # Build runner images based on runner size and operating systems operatingSystems = checkSpecification.get('operatingSystems', ["ubuntu"]) - + for operatingSystem in operatingSystems: - runnerImagesForOs = [image for image in runnerImages if image.startswith(operatingSystem)] - - for runnerImage in runnerImagesForOs: - matrix.append({ - 'os': runnerImage, - 'version': version - }) + # Construct the runner image name: {os}-{size} + runnerImage = f"{operatingSystem}-{actualRunnerSize}" + matrix.append({ + 'os': runnerImage, + 'version': version + }) useAllPlatformBundle = "false" # Default to false if checkSpecification.get('useAllPlatformBundle'):