Skip to content

ci(build): use bash instead of zsh on tart macOS runners #18987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alee1246 wants to merge 2 commits into
base: main
Choose a base branch
from
+6 −9
Open

ci(build): use bash instead of zsh on tart macOS runners #18987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcfb7af
ci(build): use bash instead of zsh on tart macOS runners
alee1246 Jul 10, 2026
4b8e682
ci(build): use a login shell for tart macOS bash jobs
alee1246 Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .gitlab/multi-os-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,16 @@ os tests ubuntu:
- apt-get update && apt-get install -y curl
- bash .gitlab/scripts/multi-os-tests.sh

# Tart VMs default to using zsh instead of bash
os tests macos:
extends: .multi_os_test_base
image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-trace-py-sonoma-latest"
tags: ["macos:sonoma-tart"]
tags: ["macos:tart"]
needs: [ "build macos arm64" ]
variables:
WHEEL_PATTERN: "macosx*arm64.whl"
PLATFORM: "macOS"
# Disables collapsable sections in multi-line scripts due to incompatibility with zsh
FF_SCRIPT_SECTIONS: "false"
# Use bash instead of the Tart VM's default zsh
TART_EXECUTOR_SHELL: "/bin/bash -l"
script:
- |
for PYTHON_VERSION in 3.10 3.12 3.14; do
Expand Down
8 changes: 3 additions & 5 deletions .gitlab/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,19 +171,17 @@ variables:
variables:
ARCH_TAG: "amd64"

# Tart VMs default to using zsh instead of bash
"build macos arm64":
extends: .build_macos_base
image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-trace-py-sonoma-latest"
tags: [ "macos:sonoma-tart" ]
tags: [ "macos:tart" ]
variables:
ARCH_TAG: "arm64"
# Disables collapsable sections in multi-line scripts due to incompatibility with zsh
FF_SCRIPT_SECTIONS: "false"
# Use bash instead of the Tart VM's default zsh
TART_EXECUTOR_SHELL: "/bin/bash -l"
SCCACHE_BUCKET: "dd-sccache-storage-us1-ddbuild-io"
SCCACHE_REGION: "us-east-1"
before_script: |
setopt shwordsplit 2>/dev/null || true
set -euo pipefail
# sccache hardcodes the IMDS IP (169.254.169.254) and ignores $AWS_EC2_METADATA_SERVICE_ENDPOINT,
# so resolve creds from the tart iam-proxy beforehand
Expand Down
Loading