Skip to content
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.

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

Fix dependency build for macOS #18581

Merged
merged 3 commits into from
Sep 13, 2024
Merged

Fix dependency build for macOS #18581

merged 3 commits into from
Sep 13, 2024

Conversation

alopezz
Copy link
Contributor

@alopezz alopezz commented Sep 13, 2024

What does this PR do?

  • Removes references to DD_PYTHON_2 which is no longer defined at the job.
  • Adds workflow file to cache key to prevent this kind of error from not being caught on the PR.
  • Adds workflow files to triggers for pushes to master.

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)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • Changelog entries must be created for modifications to shipped code
  • Add the qa/skip-qa label if the PR doesn't need to be tested during QA.
  • If you need to backport this PR to another branch, you can add the backport/<branch-name> label to the PR and it will automatically open a backport PR once this one is merged

@alopezz alopezz force-pushed the alopez/fix-macos-deps-build branch from 6de4038 to 61762e3 Compare September 13, 2024 08:57
@alopezz alopezz merged commit 9eb8f2d into master Sep 13, 2024
44 checks passed
@alopezz alopezz deleted the alopez/fix-macos-deps-build branch September 13, 2024 11:18
@datadog-agent-integrations-bot
Copy link
Contributor

The backport to 7.58.x failed:

The process '/usr/bin/git' failed with exit code 1

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.x

Then, create a pull request where the base branch is 7.58.x and the compare/head branch is backport-18581-to-7.58.x.

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 <alex.lopez.zorzano@gmail.com>
Co-authored-by: Ilia Kurenkov <ilia.kurenkov@datadoghq.com>
Co-authored-by: Alex Lopez <alex.lopez@datadoghq.com>
(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 <alex.lopez.zorzano@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants