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

[3.11] 🔥 Drop hypothesis job dep @ GHA #107128

Merged
merged 1 commit into from
Jul 23, 2023

Conversation

webknjaz
Copy link
Contributor

This fixes an incorrect conflict resolution problem that happened in 0cdc3a5 while backporting PR #97533 as PR #107115 (merged prematurely). This problem caused GitHub Actions CI/CD to crash while attempting to load the workflow file definition, preventing the jobs that are defined in .github/workflows/build.yml from actually starting.

This fixes an incorrect conflict resolution problem that happened
in 0cdc3a5 while backporting
PR python#97533 as PR python#107115 (merged prematurely). This problem caused
GitHub Actions CI/CD to crash while attempting to load the workflow
file definition, preventing the jobs that are defined in
`.github/workflows/build.yml` from actually starting.
@webknjaz
Copy link
Contributor Author

@ambv auto-merge, maybe?

@ambv ambv enabled auto-merge (squash) July 23, 2023 13:28
@ambv ambv merged commit 07acf57 into python:3.11 Jul 23, 2023
17 checks passed
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.

3 participants