Skip to content

Commit

Permalink
Fix _ vs -, rename to runner-labels.
Browse files Browse the repository at this point in the history
  • Loading branch information
ScottTodd committed Jul 16, 2024
1 parent 600aa3a commit a3fa054
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_test_runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
job_name:
required: true
type: string
runs-on:
runner-labels:
required: true
type: string # JSON encoded, see https://github.com/orgs/community/discussions/11692
container:
Expand All @@ -29,7 +29,7 @@ permissions:
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:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -528,19 +528,19 @@ 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:
Expand Down

0 comments on commit a3fa054

Please sign in to comment.