Fix _ vs -, rename to runner-labels.

ScottTodd · Jul 16, 2024 · 2485297 · 2485297
1 parent 600aa3a
commit 2485297
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/build_test_runtime.yml b/.github/workflows/build_test_runtime.yml
@@ -14,22 +14,22 @@ on:
       job_name:
         required: true
         type: string
-      runs-on:
+      job-enabled:
+        type: boolean
+        required: true
+      runner-labels:
         required: true
         type: string # JSON encoded, see https://github.com/orgs/community/discussions/11692
       container:
         type: string
-      job-enabled:
-        type: boolean
-        required: true
 
 permissions:
   contents: read
 
 jobs:
   build_test_runtime:
     name: "build_test_runtime :: ${{ inputs.job_name }}"
-    runs-on: ${{ fromJson(inputs.runs_on) }}
+    runs-on: ${{ fromJson(inputs.runner-labels) }}
     if: ${{ inputs.job-enabled }}
     defaults:
       run:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -528,26 +528,26 @@ jobs:
         include:
           - job_name: ubuntu-20.04
             job-enabled: true
-            runs-on: "['ubuntu-20.04']"
+            runner-labels: "['ubuntu-20.04']"
             container: gcr.io/iree-oss/base@sha256:dc314b4fe30fc1315742512891357bffed4d1b62ffcb46258b1e0761c737b446
           - job_name: windows-2022
             job-enabled: true
-            runs-on: "['windows-2022']"
+            runner-labels: "['windows-2022']"
             # No container, (unnecessary, and Windows https://github.com/actions/runner/issues/904).
           - job_name: macos-14
             job-enabled: true
-            runs-on: "['macos-14']"
+            runner-labels: "['macos-14']"
             # No container, just install what we need directly.
           - job_name: arm64
             job-enabled: ${{ !fromJson(needs.setup.outputs.is-pr) }}
-            runs-on: "['self-hosted', 'runner-group=${{ needs.setup.outputs.runner-group }}', 'environment=${{ needs.setup.outputs.runner-env }}', 'arm64', 'os-family=Linux']"
+            runner-labels: "['self-hosted', 'runner-group=${{ needs.setup.outputs.runner-group }}', 'environment=${{ needs.setup.outputs.runner-env }}', 'arm64', 'os-family=Linux']"
             container: gcr.io/iree-oss/base-arm64@sha256:9daa1cdbbf12da8527319ece76a64d06219e04ecb99a4cff6e6364235ddf6c59
     uses: ./.github/workflows/build_test_runtime.yml
     with:
       job_name: ${{ matrix.job_name }}
-      runs-on: ${{ matrix.runs-on }}
-      container: ${{ matrix.container }}
       job-enabled: ${{ matrix.job-enabled }}
+      runner-labels: ${{ matrix.runner-labels }}
+      container: ${{ matrix.container }}
 
   python_release_packages:
     needs: setup