Skip to content

Commit

Permalink
Merge pull request #467 from jenkinsci/updatecli_master_0af9fa03de480…
Browse files Browse the repository at this point in the history
…0958730c0202f9d36787ba56eeddf496e50e546f287dbfa768c

Bump `git-lfs` version on Windows to 3.6.0
  • Loading branch information
dduportal authored Nov 25, 2024
2 parents 198b15c + e5e504a commit e1a066b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion tests/sshAgent.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ TUwLP4n7pK4J2sCIs6fRD5kEYms4BnddXeRuI2fGZHGH70Ci/Q==
-----END RSA PRIVATE KEY-----
"@

$global:GITLFSVERSION = '3.5.1'
$global:GITLFSVERSION = '3.6.0'

Cleanup($global:CONTAINERNAME)

Expand Down
2 changes: 1 addition & 1 deletion windows/nanoserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ ENV WindowsPATH="C:\Windows\system32;C:\Windows"
ENV PATH="${WindowsPATH};${ProgramFiles}\PowerShell;${JAVA_HOME}\bin;C:\mingit\cmd"

# Install git-lfs
ARG GIT_LFS_VERSION=3.5.1
ARG GIT_LFS_VERSION=3.6.0
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
$url = $('https://github.com/git-lfs/git-lfs/releases/download/v{0}/git-lfs-windows-amd64-v{0}.zip' -f $env:GIT_LFS_VERSION) ; `
Write-Host "Retrieving $url..." ; `
Expand Down
2 changes: 1 addition & 1 deletion windows/windowsservercore/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
Remove-Item mingit.zip -Force

# Install git-lfs
ARG GIT_LFS_VERSION=3.5.1
ARG GIT_LFS_VERSION=3.6.0
RUN $CurrentPath = (Get-Itemproperty -path 'hklm:\system\currentcontrolset\control\session manager\environment' -Name Path).Path ; `
$NewPath = $CurrentPath + ';{0}\bin;C:\mingit\cmd' -f $env:JAVA_HOME ; `
Set-ItemProperty -path 'hklm:\system\currentcontrolset\control\session manager\environment' -Name Path -Value $NewPath ; `
Expand Down

0 comments on commit e1a066b

Please sign in to comment.