@@ -128,7 +128,7 @@ jobs:
128
128
129
129
# risc-v needs ubuntu 24.04 so we get the latest qemu as well as how we
130
130
# build llvm. Otherwise we choose ubuntu-22.04 (use a container for both for consistency).
131
- runs-on : ${{ contains(matrix.target, 'host_aarch64') && 'cp-graviton ' || 'cp-ubuntu-24.04' }}
131
+ runs-on : ${{ contains(matrix.target, 'host_aarch64') && 'ubuntu-22.04-arm ' || 'cp-ubuntu-24.04' }}
132
132
container :
133
133
image : ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04-x86-64:latest'
134
134
|| ( contains(matrix.target, 'host_aarch64') && 'ghcr.io/alan-forbes-cp/ock_ubuntu_22.04-aarch64:latest'
@@ -161,7 +161,7 @@ jobs:
161
161
target : ${{ fromJson(inputs.target_list) }}
162
162
exclude : ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64_riscv64) }}
163
163
164
- runs-on : ${{ contains(matrix.target, 'host_aarch64') && 'cp-graviton ' || 'cp-ubuntu-24.04' }}
164
+ runs-on : ${{ contains(matrix.target, 'host_aarch64') && 'ubuntu-22.04-arm ' || 'cp-ubuntu-24.04' }}
165
165
container :
166
166
image : ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04-x86-64:latest'
167
167
|| ( contains(matrix.target, 'host_aarch64') && 'ghcr.io/alan-forbes-cp/ock_ubuntu_22.04-aarch64:latest'
@@ -218,7 +218,7 @@ jobs:
218
218
target : ${{ fromJson(inputs.target_list) }}
219
219
exclude : ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64_riscv64) }}
220
220
221
- runs-on : ${{ contains(matrix.target, 'host_aarch64') && 'cp-graviton ' || 'cp-ubuntu-24.04' }}
221
+ runs-on : ${{ contains(matrix.target, 'host_aarch64') && 'ubuntu-22.04-arm ' || 'cp-ubuntu-24.04' }}
222
222
container :
223
223
image : ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04-x86-64:latest'
224
224
|| ( contains(matrix.target, 'host_aarch64') && 'ghcr.io/alan-forbes-cp/ock_ubuntu_22.04-aarch64:latest'
@@ -254,7 +254,7 @@ jobs:
254
254
target : ${{ fromJson(inputs.target_list) }}
255
255
exclude : ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64) }}
256
256
257
- runs-on : ${{ contains(matrix.target, 'host_aarch64') && 'cp-graviton ' || 'cp-ubuntu-24.04' }}
257
+ runs-on : ${{ contains(matrix.target, 'host_aarch64') && 'ubuntu-22.04-arm ' || 'cp-ubuntu-24.04' }}
258
258
container :
259
259
image : ${{ contains(matrix.target, 'host_aarch64') && 'ghcr.io/alan-forbes-cp/ock_ubuntu_22.04-aarch64:latest'
260
260
|| 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest' }}
@@ -316,7 +316,7 @@ jobs:
316
316
# TODO: For now just linux x86_64 & aarch64
317
317
exclude : ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64) }}
318
318
319
- runs-on : ${{ contains(matrix.target, 'host_aarch64') && 'cp-graviton ' || 'cp-ubuntu-24.04' }}
319
+ runs-on : ${{ contains(matrix.target, 'host_aarch64') && 'ubuntu-22.04-arm ' || 'cp-ubuntu-24.04' }}
320
320
container :
321
321
image : ${{ contains(matrix.target, 'host_aarch64') && 'ghcr.io/alan-forbes-cp/ock_ubuntu_22.04-aarch64:latest'
322
322
|| 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest' }}
@@ -348,7 +348,7 @@ jobs:
348
348
# TODO: For now just linux x86_64 and aarch64
349
349
exclude : ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64) }}
350
350
351
- runs-on : ${{ contains(matrix.target, 'host_aarch64') && 'cp-graviton ' || 'cp-ubuntu-24.04' }}
351
+ runs-on : ${{ contains(matrix.target, 'host_aarch64') && 'ubuntu-22.04-arm ' || 'cp-ubuntu-24.04' }}
352
352
container :
353
353
image : ${{ contains(matrix.target, 'host_aarch64') && 'ghcr.io/alan-forbes-cp/ock_ubuntu_22.04-aarch64:latest'
354
354
|| 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest' }}
0 commit comments