Skip to content

Commit

Permalink
Fix dependency build for macOS (#18581)
Browse files Browse the repository at this point in the history
* Add workflow file to cache key on macos job

* Remove reference to DD_PYTHON2 which is no longer set

* Trigger the build in master when the workflow file changes
  • Loading branch information
alopezz authored Sep 13, 2024
1 parent e1428cd commit 9eb8f2d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
4 changes: 0 additions & 4 deletions .builders/images/macos-x86_64/builder_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ set -euxo pipefail
"${DD_PYTHON3}" -m pip install --no-warn-script-location virtualenv
"${DD_PYTHON3}" -m virtualenv py3

"${DD_PYTHON2}" -m pip install --no-warn-script-location --upgrade pip
"${DD_PYTHON2}" -m pip install --no-warn-script-location virtualenv
"${DD_PYTHON2}" -m virtualenv py2

# Install always with our own prefix path
mkdir -p "${DD_PREFIX_PATH}"
cp "${DD_MOUNT_DIR}/build_context/install-from-source.sh" .
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
- master
- 7.*.*
paths:
- .github/workflows/build-deps.yml
- .builders/**
- agent_requirements.in

Expand Down Expand Up @@ -232,7 +233,7 @@ jobs:
with:
path: |
~/builder_root
key: macos-deps-builder-root-cache-${{ hashFiles('./.builders/images/macos/*', './.builders/images/*', './.builders/deps/*', './.builders/build.py') }}
key: macos-deps-builder-root-cache-${{ hashFiles('./.builders/images/macos/*', './.builders/images/*', './.builders/deps/*', './.builders/build.py', './.github/workflows/build-deps.yml') }}

- name: Run the build
env:
Expand Down

0 comments on commit 9eb8f2d

Please sign in to comment.