Fix dependency build for macOS#18581
Merged
Merged
Conversation
datadog-agent-integrations-bot
Bot
added
changelog/no-changelog
dev/testing
dev/tooling
team/agent-integrations
team/agent-delivery
alopezz
force-pushed
the
alopez/fix-macos-deps-build
branch
from
September 13, 2024 08:57
6de4038 to
61762e3
Compare
iliakur
approved these changes
Sep 13, 2024
chouquette
approved these changes
Sep 13, 2024
Contributor
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.58.x 7.58.x
# Navigate to the new working tree
cd .worktrees/backport-7.58.x
# Create a new branch
git switch --create backport-18581-to-7.58.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9eb8f2d97d7206f939ed09051022dc10bbd661cc
# Push it to GitHub
git push --set-upstream origin backport-18581-to-7.58.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.58.xThen, create a pull request where the |
Kyle-Neale
pushed a commit
that referenced
this pull request
Sep 28, 2024
* 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
Kyle-Neale
added a commit
that referenced
this pull request
Sep 30, 2024
* Bump Python 3 to 3.12 (#18212) * bump py version to 3.12 * update dbm dev container * update builders and build deps * fix python string * Build lxml dependencies for linux x64 (#18467) * fix rmq version * fix gunicorn tests * Fix lock file generation * comment out if clause to force dep resolution * bump python to 3.12.6 * fix python on Windows sha * remove DD_PYTHON2 unbound variable * fix hatch errors * remove setup.py files * fix CI * revert datadog_checks_test_helper --------- Co-authored-by: Alex Lopez <[email protected]> Co-authored-by: Ilia Kurenkov <[email protected]> Co-authored-by: Alex Lopez <[email protected]> (cherry picked from commit 69cffd9) * fix build-deps.yaml * 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 * remove changelog entries --------- Co-authored-by: Alex Lopez <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Motivation
#18577 breaks macOS builds as soon as there's a cache miss during builder setup: https://github.com/DataDog/integrations-core/actions/runs/10836797983/job/30071333931?pr=18212.
We missed this on #18577 because the cache key doesn't include the workflow key despite it potentially affecting the setup.
Additional Notes
Review checklist (to be filled by reviewers)
qa/skip-qalabel if the PR doesn't need to be tested during QA.backport/<branch-name>label to the PR and it will automatically open a backport PR once this one is merged