Skip to content

Commit f3ee22d

Browse files
authored
Merge pull request #911 from jenkinsci/updatecli_master_0af9fa03de4800958730c0202f9d36787ba56eeddf496e50e546f287dbfa768c
Bump `git-lfs` version on Windows to 3.6.0
2 parents caa70d3 + 532e5df commit f3ee22d

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

tests/agent.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if ($global:WINDOWSFLAVOR -eq 'nanoserver') {
2828
$global:CONTAINERSHELL = 'pwsh.exe'
2929
}
3030

31-
$global:GITLFSVERSION = '3.5.1'
31+
$global:GITLFSVERSION = '3.6.0'
3232

3333
# # Uncomment to help debugging when working on this script
3434
# Write-Host "= DEBUG: global vars"

windows/nanoserver/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ ENV ProgramFiles="C:\Program Files" `
7272
JAVA_HOME="${JAVA_HOME}"
7373
ENV PATH="${WindowsPATH};${ProgramFiles}\PowerShell;${JAVA_HOME}\bin;C:\mingit\cmd"
7474

75-
ARG GIT_LFS_VERSION=3.5.1
75+
ARG GIT_LFS_VERSION=3.6.0
7676
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
7777
$url = $('https://github.com/git-lfs/git-lfs/releases/download/v{0}/git-lfs-windows-amd64-v{0}.zip' -f $env:GIT_LFS_VERSION) ; `
7878
Write-Host "Retrieving $url..." ; `

windows/windowsservercore/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ RUN $CurrentPath = (Get-Itemproperty -path 'hklm:\system\currentcontrolset\contr
6464
$NewPath = $CurrentPath + $(';{0}\bin;C:\mingit\cmd' -f $env:JAVA_HOME) ; `
6565
Set-ItemProperty -path 'hklm:\system\currentcontrolset\control\session manager\environment' -Name Path -Value $NewPath
6666

67-
ARG GIT_LFS_VERSION=3.5.1
67+
ARG GIT_LFS_VERSION=3.6.0
6868
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
6969
$url = $('https://github.com/git-lfs/git-lfs/releases/download/v{0}/git-lfs-windows-amd64-v{0}.zip' -f $env:GIT_LFS_VERSION) ; `
7070
Write-Host "Retrieving $url..." ; `

0 commit comments

Comments
 (0)