Skip to content

Commit 9460959

Browse files
committed
fix: decouple container usage from runner label
The container and setup-ubuntu-packages conditions were hardcoded to only activate when runs_on == 'zondax-runners'. This prevented other runner labels (e.g. kunobi-runners) from using the Docker container, causing jobs to fail with missing tools (cargo, node, etc). Replace the runner label check with runner_preset != 'macos-arm64', which correctly enables containers for all Linux runners regardless of their label. Affected workflows: - _checks-rs.yaml - _checks-ts.yaml - _checks-links.yaml
1 parent 01b3417 commit 9460959

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/_checks-links.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ on:
7474
jobs:
7575
link-check:
7676
runs-on: ${{ fromJSON(inputs.runner_preset == 'macos-arm64' && '["self-hosted", "macOS", "ARM64"]' || format('["{0}"]', inputs.runs_on)) }}
77-
container: ${{ inputs.runs_on == 'zondax-runners' && inputs.base_image || '' }}
77+
container: ${{ inputs.runner_preset != 'macos-arm64' && inputs.base_image || '' }}
7878
timeout-minutes: ${{ inputs.timeout_minutes }}
7979
environment: ${{ inputs.environment }}
8080
permissions:
@@ -84,7 +84,7 @@ jobs:
8484
steps:
8585
- name: Setup Ubuntu packages
8686
# Skip when using zondax/ubuntu-ci (packages pre-installed, but sudo available if needed)
87-
if: inputs.runs_on == 'zondax-runners' && !startsWith(inputs.base_image, 'zondax/ubuntu-ci')
87+
if: inputs.runner_preset != 'macos-arm64' && !startsWith(inputs.base_image, 'zondax/ubuntu-ci')
8888
uses: zondax/actions/setup-ubuntu-packages@v1
8989
with:
9090
packages: |

.github/workflows/_checks-rs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ permissions:
193193
jobs:
194194
checks-rust:
195195
runs-on: ${{ fromJSON(inputs.runner_preset == 'macos-arm64' && '["self-hosted", "macOS", "ARM64"]' || format('["{0}"]', inputs.runs_on)) }}
196-
container: ${{ inputs.runner_preset != 'macos-arm64' && inputs.runs_on == 'zondax-runners' && inputs.base_image || '' }}
196+
container: ${{ inputs.runner_preset != 'macos-arm64' && inputs.base_image || '' }}
197197
timeout-minutes: ${{ inputs.timeout_minutes }}
198198
environment: ${{ inputs.environment }}
199199
env:
@@ -214,7 +214,7 @@ jobs:
214214
steps:
215215
- name: Setup Ubuntu packages
216216
# Skip when using zondax/ubuntu-ci (packages pre-installed, but sudo available if needed)
217-
if: inputs.runs_on == 'zondax-runners' && !startsWith(inputs.base_image, 'zondax/ubuntu-ci')
217+
if: inputs.runner_preset != 'macos-arm64' && !startsWith(inputs.base_image, 'zondax/ubuntu-ci')
218218
uses: zondax/actions/setup-ubuntu-packages@v1
219219
with:
220220
packages: |

.github/workflows/_checks-ts.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ on:
157157
jobs:
158158
checks-ts:
159159
runs-on: ${{ fromJSON(inputs.runner_preset == 'macos-arm64' && '["self-hosted", "macOS", "ARM64"]' || format('["{0}"]', inputs.runs_on)) }}
160-
container: ${{ inputs.runner_preset != 'macos-arm64' && inputs.runs_on == 'zondax-runners' && inputs.base_image || '' }}
160+
container: ${{ inputs.runner_preset != 'macos-arm64' && inputs.base_image || '' }}
161161
timeout-minutes: ${{ inputs.timeout_minutes }}
162162
environment: ${{ inputs.environment }}
163163
permissions:
@@ -168,7 +168,7 @@ jobs:
168168
steps:
169169
- name: Setup Ubuntu packages
170170
# Skip when using zondax/ubuntu-ci (packages pre-installed, but sudo available if needed)
171-
if: inputs.runs_on == 'zondax-runners' && !startsWith(inputs.base_image, 'zondax/ubuntu-ci')
171+
if: inputs.runner_preset != 'macos-arm64' && !startsWith(inputs.base_image, 'zondax/ubuntu-ci')
172172
uses: zondax/actions/setup-ubuntu-packages@v1
173173
with:
174174
packages: |

0 commit comments

Comments
 (0)