Skip to content

Commit 9eb8f2d

Browse files
authored
Fix dependency build for macOS (#18581)
* 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
1 parent e1428cd commit 9eb8f2d

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

.builders/images/macos-x86_64/builder_setup.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ set -euxo pipefail
66
"${DD_PYTHON3}" -m pip install --no-warn-script-location virtualenv
77
"${DD_PYTHON3}" -m virtualenv py3
88

9-
"${DD_PYTHON2}" -m pip install --no-warn-script-location --upgrade pip
10-
"${DD_PYTHON2}" -m pip install --no-warn-script-location virtualenv
11-
"${DD_PYTHON2}" -m virtualenv py2
12-
139
# Install always with our own prefix path
1410
mkdir -p "${DD_PREFIX_PATH}"
1511
cp "${DD_MOUNT_DIR}/build_context/install-from-source.sh" .

.github/workflows/build-deps.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ on:
1515
- master
1616
- 7.*.*
1717
paths:
18+
- .github/workflows/build-deps.yml
1819
- .builders/**
1920
- agent_requirements.in
2021

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

237238
- name: Run the build
238239
env:

0 commit comments

Comments
 (0)