Skip to content
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

Fix installer builds #442

Merged
merged 3 commits into from
Oct 11, 2021
Merged

Conversation

derrickstolee
Copy link
Collaborator

I was working last week to update the git-update-git-for-windows script to repeat daily reminders to upgrade. I did not succeed in doing that, but I found some other issues that are resolved in this PR:

  1. We can speed up the Windows installer builds by using partial clone of the git-for-windows/build-extra repo.
  2. There is a filename variable that doesn't work in one place. Use the literal path instead.
  3. The macOS builds need an explicit version update to compile with FS Monitor due to compatibility issues with older versions of macOS. This required some changes to derrickstolee/git_osx_installer, too.

These changes were integrated in a successful run of the build-git-installers workflow.

@derrickstolee derrickstolee self-assigned this Oct 11, 2021
Copy link

@vdye vdye left a comment

Choose a reason for hiding this comment

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

Looks good! Just had one question about using your build-extra fork.

.github/workflows/build-git-installers.yml Outdated Show resolved Hide resolved
.github: use partial clone for build-extra

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
…workflow

.github: fix errant 'filename' variable

At this point in the script, 'filename' contains a relative path to a
file, but that does not resolve correctly. Remove the variable and place
the filename directly within the path.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
.github: fix macOS installer build

Update the macOS version strings to versions that reflect the build
machines and allow us to compile the release builds including FS
Monitor.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Copy link

@ldennington ldennington left a comment

Choose a reason for hiding this comment

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

Looks good - thanks for the fixes!

@derrickstolee derrickstolee merged commit 14d3302 into microsoft:vfs-2.33.0 Oct 11, 2021
cat $b/git-extra/git-update-git-for-windows &&

sed -i -e '/^# when confirmation to do so is given./a\
use_recently_seen=no' \
$b/git-extra/git-update-git-for-windows
Copy link
Member

Choose a reason for hiding this comment

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

This should target /mingw64/bin/git-update-git-for-windows, correct?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants