Skip to content

[3.13] Add zizmor to pre-commit and fix most findings (#127749) #127786

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

Merged
merged 1 commit into from
Dec 10, 2024

Conversation

hugovk
Copy link
Member

@hugovk hugovk commented Dec 10, 2024

Co-authored-by: Alex Waygood Alex.Waygood@Gmail.com
(cherry picked from commit ae31df3)

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
(cherry picked from commit ae31df3)
@AlexWaygood
Copy link
Member

Looks like you might need to add shell: bash to a couple more windows workflows here?

@hugovk
Copy link
Member Author

hugovk commented Dec 10, 2024

No, JIT/Windows is also failing in a clean 3.13 branch: https://github.com/hugovk/cpython/actions/runs/12255332851/job/34188652334

      | RuntimeError: Can't find clang-18!

And the changes in .github/workflows/jit.yml are only adding persist-credentials: false so not related to shell/variables.

cc @brandtbucher FYI

@AlexWaygood
Copy link
Member

Ah, thanks, I should have looked more closely!

@AlexWaygood
Copy link
Member

I think the Windows failures in #127788 might be related, however? The error message there is different

@hugovk hugovk enabled auto-merge (squash) December 10, 2024 13:44
@hugovk hugovk merged commit 990ea33 into python:3.13 Dec 10, 2024
64 of 74 checks passed
@hugovk hugovk deleted the backport-ae31df3-3.13 branch December 10, 2024 13:48
- name: Build CPython installer
run: .\Tools\msi\build.bat --doc -${{ inputs.arch }}
run: .\Tools\msi\build.bat --doc -"${ARCH}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this probably should also have been

Suggested change
run: .\Tools\msi\build.bat --doc -"${ARCH}"
run: .\Tools\msi\build.bat --doc -"${ARCH}"
shell: bash

maybe this job doesn't run on PRs?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmmm... are we absolutely confident that the environment variable was properly expanded as part of the command that successfully ran in that workflow?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's double check. Just heading out to Helsinki Python, I can check tomorrow if no-one beats me to it!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed it's needed.

Without:

Run echo 123 "${ARCH}" 456 && .\Tools\msi\build.bat --doc -"${ARCH}"
123

456

With:

Run echo 123 "${ARCH}" 456 && .\Tools\msi\build.bat --doc -"${ARCH}"
123 arm64 456

Please see PR #127822.

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