-
Notifications
You must be signed in to change notification settings - Fork 92
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
Add --include-pdbs
to make_installers_from_mingw_w64_git()
#403
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- Draft release containing PDBs (Windows installers only): https://github.com/vdye/git/releases/tag/v2.32.0.vfs.pdb
This draft release doesn't appear to have the PDBs. Am I missing something?
eval /usr/src/build-extra/please.sh make_installers_from_mingw_w64_git --version=${{ needs.prereqs.outputs.tag_version }} -o artifacts --${{matrix.artifact.name}} --pkg=pkg-x86_64/mingw-w64-x86_64-git-[0-9]*.tar.xz --pkg=pkg-x86_64/mingw-w64-x86_64-git-doc-html-[0-9]*.tar.xz && | ||
b="/usr/src/build-extra" && | ||
mkdir -p $b/cached-source-packages && | ||
cp pkg-x86_64/*-pdb* $b/cached-source-packages/ && |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this line need to be after the eval
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The PDB archive needs to be "staged" in the cached-source-packages
directory before make_installers_from_mingw_w64_git
is run with the --include-pdbs
flag (this pull request added that option: git-for-windows/build-extra#369).
EDIT: I'll add a comment clarifying that in the workflow
After discussing it with @dscho, I learned that PDBs are included by embedding the PDB files in the installers themselves (the easiest way to tell is the size of the x86-64 Windows installer - it's about 48MB without PDBs (e.g., Git for Windows 2.32.0(2)) and about 52MB with PDBs (e.g., Microsoft Git 2.32.0.vfs.0.3 or the draft release). What I gathered from that was that including the separate archive of standalone PDB files wasn't necessary. I'm happy to add it back into the release, though! |
Ah! This is different than how I've been installing PDBs after-the-fact. Thanks for clearing this up! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we mark up the commit as a fixup!
commit, so that future rebases are made a bit easier? Other than that, I like it!
@@ -187,24 +187,23 @@ jobs: | |||
run: | | |||
set -x | |||
|
|||
eval /usr/src/build-extra/please.sh make_installers_from_mingw_w64_git --version=${{ needs.prereqs.outputs.tag_version }} -o artifacts --${{matrix.artifact.name}} --pkg=pkg-x86_64/mingw-w64-x86_64-git-[0-9]*.tar.xz --pkg=pkg-x86_64/mingw-w64-x86_64-git-doc-html-[0-9]*.tar.xz && | |||
# Copy the PDB archive to the directory where `--include-pdbs` expects it | |||
b="/usr/src/build-extra" && |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The double quotes are not needed here because there is no special character nor space in the value. Maybe lose the quotes?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed quotes & amended this commit to fixup!
the Windows installer commit from the original pull request.
Dependent on git-for-windows/build-extra#369 for
--include-pdbs
flag. Also removes separatebundle_pdbs
step - not needed for this workflow.References