(The SBOM build will fail for the time being.)

!buildbot x86

🤖 New build scheduled with the buildbot fleet by@encukou for commit091fd62 🤖

The command will test the builders whose names match following regular expression:x86

The builders matched are:

• x86-64 MacOS Intel NoGIL PR
• x86-64 macOS PR
• x86 Debian Installed with X PR
• x86-64 MacOS Intel ASAN NoGIL PR
• x86 Debian Non-Debug with X PR

Looks like this compiles but gives an unrelated error in tests.@gpshead@encukou do you agree? If so, I'll fix it upstream

Yup, I agree!
I'll need to fix that ctypes error now that it's uncovered :)

buildbot/x86 Debian Installed with X PR — Build done.
buildbot/x86 Debian Non-Debug with X PR — Build done.

Tests failed on these two workers, but it's a known issue:#121938

This PR fix the build on these two workers:#125535

(The SBOM build will fail for the time being.)

I ranmake regen-sbom.

If it works, I'll patch & fix upstream, then pull it in accordingly into CPython. Thank you!

Yeah, please fix upstream ;-)

The fix just got merged a couple hours ago upstream, I need to run a build to refresh the correct folder, and then I'll push the refresh here (along with make regen-sbom). Thanks!

@gpshead@encukou: Why did you block merging this PR? Do you prefer to wait until upstream is fixed, and then update Hacl in Python?

Yes.

Ok this is pushed, let's see what CI says.@vstinner FYI, this would be an SBOM violation to push a local fix to an external vendored library, so this is why we have to propagate the fix upstream first... thanks!

FYI, this would be an SBOM violation to push a local fix to an external vendored library

I didn't know that. We made many changes in mimalloc vendored copy.

Maybe mimalloc gets a different treatment? The SBOM CI target fails if the vendored copy of HACL* is not exactly identical to upstream...

For this one we set it up to be upstream-first and just track specific upstream versions. it works since we've got active maintainers. :)

!buildbot x86 Deb

🤖 New build scheduled with the buildbot fleet by@zware for commitacd04e6 🤖

The command will test the builders whose names match following regular expression:x86 Deb

The builders matched are:

• x86 Debian Non-Debug with X PR
• x86 Debian Installed with X PR

This fixes the build issue on x86 Debian. Not sure what's up with theCI job checking the SBOM, though. I can't reproduce that failure locally (cc@sethmlarson for sbom insight).

@msprotz: Can you re-runmake regen-sbom?

I thought I had run it. Let me run it again.

I committed the suggested change, butmake regen-sbom generates no diff on my machine still. Let's see if this fixes CI

I could have left a clearer note, sorry. It turned out that the generated files check was failing onregen-sbom becauseTools/build/generate_sbom.py behaves differently ifCI is defined in the environment. In that case, it actually does the download and regenerates the checksum.

Ah ok! Good to know for next time, thank you.