Commit 44a33e5
authored
ci(build): use bash instead of zsh on tart macOS runners (#18987)
## Description
Follow-up to #17501. It was requested in the past to use `bash` over `zsh` in the jobs using that tart runners.
Sets `TART_EXECUTOR_SHELL="/bin/bash -l"` on the tart macOS jobs so the [gitlab-tart-executor](https://github.com/cirruslabs/gitlab-tart-executor) runs bash instead of the VM's default zsh.
This removes the zsh-specific workarounds that were added when the tart runners were introduced:
- `setopt shwordsplit` in `build macos arm64`'s `before_script`
- `FF_SCRIPT_SECTIONS: "false"` on `build macos arm64` and `os tests macos` (disabled because GitLab's collapsible script-section wrapper was incompatible with zsh)
Also renames the runner tag from `macos:sonoma-tart` to `macos:tart`.
## Testing
- [x] CI pipeline passes with `build macos arm64` and `os tests macos` running under bash on `macos:tart` runners
## Additional Notes
CI-only change, no user-facing impact — will add the `changelog/no-changelog` label.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-authored-by: andrewzh.lee <andrewzh.lee@datadoghq.com>1 parent ae5f13b commit 44a33e5
2 files changed
Lines changed: 6 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
38 | 37 | | |
39 | 38 | | |
40 | 39 | | |
41 | | - | |
| 40 | + | |
42 | 41 | | |
43 | 42 | | |
44 | 43 | | |
45 | 44 | | |
46 | | - | |
47 | | - | |
| 45 | + | |
| 46 | + | |
48 | 47 | | |
49 | 48 | | |
50 | 49 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
171 | 171 | | |
172 | 172 | | |
173 | 173 | | |
174 | | - | |
175 | 174 | | |
176 | 175 | | |
177 | 176 | | |
178 | | - | |
| 177 | + | |
179 | 178 | | |
180 | 179 | | |
181 | | - | |
182 | | - | |
| 180 | + | |
| 181 | + | |
183 | 182 | | |
184 | 183 | | |
185 | 184 | | |
186 | | - | |
187 | 185 | | |
188 | 186 | | |
189 | 187 | | |
| |||
0 commit comments