Skip to content

/ cpython

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

Jump to bottom

bpo-44381: Windows build now allows enabling control flow guard #26645

Merged
merged 1 commit into from Jun 11, 2021
Merged

bpo-44381: Windows build now allows enabling control flow guard #26645

merged 1 commit into from Jun 11, 2021
+4 −2

Conversation

@zooba
Copy link
Member

@zooba zooba commented Jun 10, 2021 •
edited by bedevere-bot

Also moves a conditional operation to a neater (and more correct) place.

https://bugs.python.org/issue44381
@zooba
bpo-44381: Windows build now allows enabling control flow guard
88be06b
@zooba zooba requested a review from python/windows-team as a code owner Jun 10, 2021
@zooba zooba merged commit 5af56c6 into python:main Jun 11, 2021
12 checks passed
12 checks passed
@github-actions
Docs
Details
@github-actions
Check for source changes
Details
@github-actions
Check if generated files are up to date
Details
@github-actions
Windows (x86)
Details
@github-actions
Windows (x64)
Details
@github-actions
macOS
Details
@github-actions
Ubuntu
Details
@github-actions
Ubuntu SSL tests with OpenSSL
Details
Azure Pipelines PR #20210610.23 succeeded
Details
@travis-ci
Travis CI - Pull Request Build Passed
Details
@bedevere-bot
bedevere/issue-number Issue number 44381 found
Details
@bedevere-bot
bedevere/news News entry found in Misc/NEWS.d
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Jun 11, 2021

Thanks @zooba for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10, 3.8, 3.9.
🐍🍒⛏🤖
@zooba zooba deleted the zooba:bpo-44381 branch Jun 11, 2021
@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented Jun 11, 2021

GH-26681 is a backport of this pull request to the 3.10 branch.
miss-islington added a commit to miss-islington/cpython that referenced this pull request Jun 11, 2021
@zooba @miss-islington
bpo-44381: Windows build now allows enabling control flow guard (pyth…
37a3f30 
…onGH-26645)

(cherry picked from commit 5af56c6)

Co-authored-by: Steve Dower <steve.dower@python.org>
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Jun 11, 2021

Sorry, @zooba, I could not cleanly backport this to 3.8 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 5af56c6f2a0d11df37fed7ecaaf321cf6926ba13 3.8
@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented Jun 11, 2021

GH-26682 is a backport of this pull request to the 3.9 branch.
miss-islington added a commit to miss-islington/cpython that referenced this pull request Jun 11, 2021
@zooba @miss-islington
bpo-44381: Windows build now allows enabling control flow guard (pyth…
511c7e2 
…onGH-26645)

(cherry picked from commit 5af56c6)

Co-authored-by: Steve Dower <steve.dower@python.org>
zooba pushed a commit that referenced this pull request Jun 11, 2021
@miss-islington
bpo-44381: Windows build now allows enabling control flow guard (GH-2…
9580d38 
…6645)

(cherry picked from commit 5af56c6)
miss-islington added a commit that referenced this pull request Jun 11, 2021
@miss-islington @zooba
bpo-44381: Windows build now allows enabling control flow guard (GH-2…
42612db 
…6645)

(cherry picked from commit 5af56c6)

Co-authored-by: Steve Dower <steve.dower@python.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@python/windows-team windows-team

Assignees

@zooba zooba

Labels
CLA signed OS-windows
Projects
None yet
Milestone
No milestone
4 participants
@zooba @miss-islington @bedevere-bot @the-knights-who-say-ni