Skip to content

gh-131261: expat/refresh.sh: Expand list of manual steps #131359

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.

Sign up for GitHub

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 3 commits into from
Mar 18, 2025
Merged

gh-131261: expat/refresh.sh: Expand list of manual steps #131359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcb099a
expat/refresh.sh: Expand list of manual steps
encukou Mar 17, 2025
7829c82
Merge branch 'main' into expat-update-notes
encukou Mar 17, 2025
089623f
Exclude Modules/expat/refresh.sh from SBOM
encukou Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions Misc/sbom.spdx.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 10 additions & 1 deletion Modules/expat/refresh.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,13 @@ rm libexpat.tar.gz
# Step 3: Add the namespacing include to expat_external.h
sed -i 's/#define Expat_External_INCLUDED 1/&\n\n\/* Namespace external symbols to allow multiple libexpat version to\n co-exist. \*\/\n#include "pyexpatns.h"/' expat_external.h

echo "Updated; verify all is okay using git diff and git status."
echo "
Updated! next steps:
- Verify all is okay:
git diff
git status
- Regenerate the sbom file
make regen-sbom
- Update warning count in Tools/build/.warningignore_macos
(use info from CI if not on a Mac)
"
2 changes: 1 addition & 1 deletion Tools/build/generate_sbom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class PackageFiles(typing.NamedTuple):
exclude=[
"Modules/expat/expat_config.h",
"Modules/expat/pyexpatns.h",
"Modules/_hacl/refresh.sh",
"Modules/expat/refresh.sh",
]
),
"macholib": PackageFiles(
Expand Down
Loading