Skip to content

Update windows dev environment to git 2.22

Steve Xuereb requested to merge update-git-for-windows into master

What does this MR do?

Update windows dev environment to git 2.22

Why was this MR needed?

Update the git version to the latest stable version.

Are there points in the code the reviewer needs to double check?

Full provistioning logs 
$ vagrant up                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 08:39:25
Bringing machine 'windows_server' up with 'virtualbox' provider...
==> windows_server: Cloning VM...
==> windows_server: Matching MAC address for NAT networking...
==> windows_server: Checking if box 'StefanScherer/windows_2019_docker' version '2018.11.22' is up to date...
==> windows_server: A newer version of the box 'StefanScherer/windows_2019_docker' for provider 'virtualbox' is
==> windows_server: available! You currently have version '2018.11.22'. The latest is version
==> windows_server: '2019.07.22'. Run `vagrant box update` to update.
==> windows_server: Setting the name of the VM: gitlab-runner_windows_server_1565678381392_66144
==> windows_server: Clearing any previously set network interfaces...
==> windows_server: Preparing network interfaces based on configuration...
    windows_server: Adapter 1: nat
==> windows_server: Forwarding ports...
    windows_server: 3389 (guest) => 3389 (host) (adapter 1)
    windows_server: 5985 (guest) => 55985 (host) (adapter 1)
    windows_server: 5986 (guest) => 55986 (host) (adapter 1)
    windows_server: 22 (guest) => 2222 (host) (adapter 1)
==> windows_server: Running 'pre-boot' VM customizations...
==> windows_server: Booting VM...
==> windows_server: Waiting for machine to boot. This may take a few minutes...
    windows_server: WinRM address: 127.0.0.1:55985
    windows_server: WinRM username: vagrant
    windows_server: WinRM execution_time_limit: PT2H
    windows_server: WinRM transport: negotiate
==> windows_server: Machine booted and ready!
==> windows_server: Checking for guest additions in VM...
    windows_server: The guest additions on this VM do not match the installed version of
    windows_server: VirtualBox! In most cases this is fine, but in rare cases it can
    windows_server: prevent things such as shared folders from working properly. If you see
    windows_server: shared folder errors, please make sure the guest additions within the
    windows_server: virtual machine match the version of VirtualBox you have installed on
    windows_server: your host and reload your VM.
    windows_server:
    windows_server: Guest Additions Version: 5.2.22
    windows_server: VirtualBox Version: 6.0
==> windows_server: Mounting shared folders...
    windows_server: C:\Go\src\gitlab.com\gitlab-org\gitlab-runner => /Users/steve/Code/go/src/gitlab.com/gitlab-org/gitlab-runner
==> windows_server: Running provisioner: shell...
    windows_server: Running: scripts/vagrant/provision/base.ps1 as c:\tmp\vagrant-shell.ps1
    windows_server: downloading https://storage.googleapis.com/golang/go1.8.windows-amd64.msi
    windows_server: https://storage.googleapis.com/golang/go1.8.windows-amd64.msi downloaded as C:\Users\vagrant\AppData\Local\Temp\tmp6C94.tmp
    windows_server: installing go 1.8...
    windows_server: done
    windows_server: downloading https://github.com/git-for-windows/git/releases/download/v2.22.0.windows.1/Git-2.22.0-64-bit.exe
    windows_server: https://github.com/git-for-windows/git/releases/download/v2.22.0.windows.1/Git-2.22.0-64-bit.exe downloaded as C:\Users\vagrant\AppData\Local\Temp\tmp490.tmp
    windows_server: installing git 2.22.0...
    windows_server: done
==> windows_server: Running provisioner: shell...
    windows_server: Running: scripts/vagrant/provision/install_PSWindowsUpdate.ps1 as c:\tmp\vagrant-shell.ps1
    windows_server: Installing PSWindowsUpdate module
    windows_server: Name                           Version          Source           Summary
    windows_server: ----                           -------          ------           -------
    windows_server: nuget                          2.8.5.208        https://onege... NuGet provider for the OneGet meta-package manager
==> windows_server: Running provisioner: shell...
    windows_server: Running: scripts/vagrant/provision/windows_update.ps1 as c:\tmp\vagrant-shell.ps1
    windows_server: Running windows update
    windows_server: X ComputerName Result     KB          Size Title
    windows_server: - ------------ ------     --          ---- -----
    windows_server: 1 VAGRANT-2019 Accepted   KB4507419   63MB 2019-07 Cumulative Update for .NET Framework 3.5, 4.7.2, 4.8 on Windows S...
    windows_server: 1 VAGRANT-2019 Accepted   KB4052623    5MB Update for Windows Defender Antivirus antimalware platform - KB4052623 (V...
    windows_server: 1 VAGRANT-2019 Accepted   KB2267602  172MB Security Intelligence Update for Windows Defender Antivirus - KB2267602 (...
    windows_server: 1 VAGRANT-2019 Accepted   KB4507469   14GB 2019-07 Cumulative Update for Windows Server 2019 (1809) for x64-based Sy...
    windows_server: 2 VAGRANT-2019 Downloaded KB4507419   63MB 2019-07 Cumulative Update for .NET Framework 3.5, 4.7.2, 4.8 on Windows S...
    windows_server: 2 VAGRANT-2019 Downloaded KB4052623    5MB Update for Windows Defender Antivirus antimalware platform - KB4052623 (V...
    windows_server: 2 VAGRANT-2019 Downloaded KB2267602  172MB Security Intelligence Update for Windows Defender Antivirus - KB2267602 (...
    windows_server: 2 VAGRANT-2019 Downloaded KB4507469   14GB 2019-07 Cumulative Update for Windows Server 2019 (1809) for x64-based Sy...
    windows_server: Install-WindowsUpdate : Operation tried to install while another installation was in progress or the system was
    windows_server: pending a mandatory restart.
    windows_server: At C:\tmp\vagrant-shell.ps1:5 char:5
    windows_server: +     Install-WindowsUpdate -AcceptAll -IgnoreReboot
    windows_server: +     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    windows_server:     + CategoryInfo          : CloseError: (:) [Get-WindowsUpdate], Exception
    windows_server:     + FullyQualifiedErrorId : 0x80240016,PSWindowsUpdate.GetWindowsUpdate
==> windows_server: Running provisioner: reload...
==> windows_server: Attempting graceful shutdown of VM...
==> windows_server: Checking if box 'StefanScherer/windows_2019_docker' version '2018.11.22' is up to date...
==> windows_server: Clearing any previously set forwarded ports...
==> windows_server: Clearing any previously set network interfaces...
==> windows_server: Preparing network interfaces based on configuration...
    windows_server: Adapter 1: nat
==> windows_server: Forwarding ports...
    windows_server: 3389 (guest) => 3389 (host) (adapter 1)
    windows_server: 5985 (guest) => 55985 (host) (adapter 1)
    windows_server: 5986 (guest) => 55986 (host) (adapter 1)
    windows_server: 22 (guest) => 2222 (host) (adapter 1)
==> windows_server: Running 'pre-boot' VM customizations...
==> windows_server: Booting VM...
==> windows_server: Waiting for machine to boot. This may take a few minutes...
    windows_server: WinRM address: 127.0.0.1:55985
    windows_server: WinRM username: vagrant
    windows_server: WinRM execution_time_limit: PT2H
    windows_server: WinRM transport: negotiate
==> windows_server: Machine booted and ready!
==> windows_server: Checking for guest additions in VM...
    windows_server: The guest additions on this VM do not match the installed version of
    windows_server: VirtualBox! In most cases this is fine, but in rare cases it can
    windows_server: prevent things such as shared folders from working properly. If you see
    windows_server: shared folder errors, please make sure the guest additions within the
    windows_server: virtual machine match the version of VirtualBox you have installed on
    windows_server: your host and reload your VM.
    windows_server:
    windows_server: Guest Additions Version: 5.2.22
    windows_server: VirtualBox Version: 6.0
==> windows_server: Mounting shared folders...
    windows_server: C:\Go\src\gitlab.com\gitlab-org\gitlab-runner => /Users/steve/Code/go/src/gitlab.com/gitlab-org/gitlab-runner
==> windows_server: Machine already provisioned. Run `vagrant provision` or use the `--provision`
==> windows_server: flag to force provisioning. Provisioners marked to run always will still run.
==> windows_server: Running provisioner: shell...
    windows_server: Running: scripts/vagrant/provision/windows_update.ps1 as c:\tmp\vagrant-shell.ps1
    windows_server: Running windows update
    windows_server: X ComputerName Result     KB          Size Title
    windows_server: - ------------ ------     --          ---- -----
    windows_server: 1 VAGRANT-2019 Accepted   KB4052623    5MB Update for Windows Defender Antivirus antimalware platform - KB4052623 (V...
    windows_server: 1 VAGRANT-2019 Accepted   KB4507469   14GB 2019-07 Cumulative Update for Windows Server 2019 (1809) for x64-based Sy...
    windows_server: 2 VAGRANT-2019 Downloaded KB4052623    5MB Update for Windows Defender Antivirus antimalware platform - KB4052623 (V...
    windows_server: 2 VAGRANT-2019 Downloaded KB4507469   14GB 2019-07 Cumulative Update for Windows Server 2019 (1809) for x64-based Sy...
    windows_server: 3 VAGRANT-2019 Installed  KB4052623    5MB Update for Windows Defender Antivirus antimalware platform - KB4052623 (V...
    windows_server: 3 VAGRANT-2019 Installed  KB4507469   14GB 2019-07 Cumulative Update for Windows Server 2019 (1809) for x64-based Sy...
    windows_server: Reboot is required, but do it manually.
==> windows_server: Running provisioner: reload...
==> windows_server: Attempting graceful shutdown of VM...
==> windows_server: Checking if box 'StefanScherer/windows_2019_docker' version '2018.11.22' is up to date...
==> windows_server: Clearing any previously set forwarded ports...
==> windows_server: Clearing any previously set network interfaces...
==> windows_server: Preparing network interfaces based on configuration...
    windows_server: Adapter 1: nat
==> windows_server: Forwarding ports...
    windows_server: 3389 (guest) => 3389 (host) (adapter 1)
    windows_server: 5985 (guest) => 55985 (host) (adapter 1)
    windows_server: 5986 (guest) => 55986 (host) (adapter 1)
    windows_server: 22 (guest) => 2222 (host) (adapter 1)
==> windows_server: Running 'pre-boot' VM customizations...
==> windows_server: Booting VM...
==> windows_server: Waiting for machine to boot. This may take a few minutes...
    windows_server: WinRM address: 127.0.0.1:55985
    windows_server: WinRM username: vagrant
    windows_server: WinRM execution_time_limit: PT2H
    windows_server: WinRM transport: negotiate
==> windows_server: Machine booted and ready!
==> windows_server: Checking for guest additions in VM...
    windows_server: The guest additions on this VM do not match the installed version of
    windows_server: VirtualBox! In most cases this is fine, but in rare cases it can
    windows_server: prevent things such as shared folders from working properly. If you see
    windows_server: shared folder errors, please make sure the guest additions within the
    windows_server: virtual machine match the version of VirtualBox you have installed on
    windows_server: your host and reload your VM.
    windows_server:
    windows_server: Guest Additions Version: 5.2.22
    windows_server: VirtualBox Version: 6.0
==> windows_server: Mounting shared folders...
    windows_server: C:\Go\src\gitlab.com\gitlab-org\gitlab-runner => /Users/steve/Code/go/src/gitlab.com/gitlab-org/gitlab-runner
==> windows_server: Machine already provisioned. Run `vagrant provision` or use the `--provision`
==> windows_server: flag to force provisioning. Provisioners marked to run always will still run.
==> windows_server: Running provisioner: shell...
    windows_server: Running: scripts/vagrant/provision/enable_sshd.ps1 as c:\tmp\vagrant-shell.ps1
    windows_server: Enabling OpenSSH
    windows_server: Path          :
    windows_server: Online        : True
    windows_server: RestartNeeded : False

$  vagrant ssh
vagrant@127.0.0.1's password:
Microsoft Windows [Version 10.0.17763.615]
(c) 2018 Microsoft Corporation. All rights reserved.

vagrant@VAGRANT-2019 C:\Users\vagrant>git --version
git version 2.22.0.windows.1

vagrant@VAGRANT-2019 C:\Users\vagrant>exit
Connection to 127.0.0.1 closed.

Does this MR meet the acceptance criteria?

  • Documentation created/updated
  • Added tests for this feature/bug
  • In case of conflicts with master - branch was rebased

Merge request reports