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

build-git-installers: Ubuntu bugfix, Windows features #413

Merged
merged 2 commits into from
Aug 23, 2021
Merged

build-git-installers: Ubuntu bugfix, Windows features #413

merged 2 commits into from
Aug 23, 2021

Conversation

vdye
Copy link
Collaborator

@vdye vdye commented Aug 23, 2021

Changes

  • Set explicit version (18.04) for Ubuntu artifact build
    • ubuntu-latest was version 21.04 - caused errors when installing the package on older OS versions
    • Now matches the version built in the Azure DevOps pipeline
  • Forward-ported features from the Windows build in the Azure DevOps pipeline (all done by modifying the install.iss file used to build the installers)
    • Re-target auto-update to microsoft/git
    • Set the app publisher to "The Git Fundamentals Team at GitHub"
    • Let the installer configure Visual Studio to use it
    • Enable scalar in the auto-updater by default

Testing

@vdye vdye self-assigned this Aug 23, 2021
@dscho
Copy link
Member

dscho commented Aug 23, 2021

Set explicit version (18.04) for Ubuntu artifact build

* `ubuntu-latest` was version 21.04 - caused errors when installing the package on older OS versions

* Now matches the version built in the Azure DevOps pipeline

Maybe we could include that information in the fixup! commit message? And while at it, enhance on it by saying that it allows the artifacts to be used both on Ubuntu 18.04 and 21.04?

Copy link
Member

@dscho dscho left a comment

Choose a reason for hiding this comment

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

This looks good.

At some stage, we might want to move bits and pieces from the build-git-installers workflow to shell scripts in ci/, but we don't really have to.

Set Ubuntu OS version to 18.04 (rather than "latest" which, at the time of this
commit, is 21.04) for the .deb package build job. This OS version matches the
version used by the Azure DevOps pipeline, and generates artifacts compatible
with 18.04 and 21.04.
Add microsoft/git-specific components to Windows build
@vdye
Copy link
Collaborator Author

vdye commented Aug 23, 2021

Unrelated to the changes in this PR, but this is now the second time I've noticed it - when I force-push an update that contains no code changes since the last push, the merge checks on the pull request get stuck waiting for "expected" checks that never happen because the trigger for them is skipped.

What's the right way to handle this? I could delete the previous builds for these changes then re-trigger this pipeline (which will force re-running all checks), but that seems like an inefficient workaround.

@derrickstolee
Copy link
Collaborator

Unrelated to the changes in this PR, but this is now the second time I've noticed it - when I force-push an update that contains no code changes since the last push, the merge checks on the pull request get stuck waiting for "expected" checks that never happen because the trigger for them is skipped.

What's the right way to handle this? I could delete the previous builds for these changes then re-trigger this pipeline (which will force re-running all checks), but that seems like an inefficient workaround.

In these cases, we can just merge with admin privileges. We need a way to have "skipped because known good" mean "passed".

@dscho
Copy link
Member

dscho commented Aug 23, 2021

The fault is mine: there is a step in the workflow that tries to figure out whether a previous build with the same commit (or a tree-same commit) passed. If it finds such a build, it skips the entire build.

GitHub's UI does not allow us to accommodate for this: naturally, the jobs will have been skipped, and therefore the "required!" flags will prevent the PRs from being merged just like that.

@vdye vdye merged commit d5ec357 into microsoft:vfs-2.33.0 Aug 23, 2021
@vdye vdye deleted the bugfix/build-installers-misc branch August 23, 2021 16:44
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.

3 participants