Merge pull request #303 from jenkinsci/updatecli_9df5773bc5a70c522a87…

…202bf7015cc59b96c1bff3b4dd5158995f67e05dfac4 Bump Git version on Windows to 2.42.0.windows.1
jenkinsci · Aug 28, 2023 · 2b006cd · 2b006cd
2 parents f301456 + 47a1187
commit 2b006cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/windows/nanoserver-ltsc2019/Dockerfile b/windows/nanoserver-ltsc2019/Dockerfile
@@ -39,8 +39,8 @@ COPY --from=jdk-core $JAVA_HOME $JAVA_HOME
 RUN $javaMajorVersion = $env:JAVA_HOME.Substring($env:JAVA_HOME.Length - 2); `
     New-Item -Path "C:\jdk-${javaMajorVersion}" -ItemType SymbolicLink -Value "${env:JAVA_HOME}"
 
-ARG GIT_VERSION=2.41.0
-ARG GIT_PATCH_VERSION=3
+ARG GIT_VERSION=2.42.0
+ARG GIT_PATCH_VERSION=1
 RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
     # The patch "windows.1" always have a different URL than the subsequent patch (ZIP filename is different)
     if($env:GIT_PATCH_VERSION -eq 1) { $url = $('https://github.com/git-for-windows/git/releases/download/v{0}.windows.{1}/MinGit-{0}-64-bit.zip' -f $env:GIT_VERSION, $env:GIT_PATCH_VERSION); } `

diff --git a/windows/windowsservercore-ltsc2019/Dockerfile b/windows/windowsservercore-ltsc2019/Dockerfile
@@ -37,8 +37,8 @@ ENV JENKINS_AGENT_WORK ${JENKINS_AGENT_WORK}
 USER ContainerAdministrator
 
 # install git
-ARG GIT_VERSION=2.41.0
-ARG GIT_PATCH_VERSION=3
+ARG GIT_VERSION=2.42.0
+ARG GIT_PATCH_VERSION=1
 RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
     # The patch "windows.1" always have a different URL than the subsequent patch (ZIP filename is different)
     if($env:GIT_PATCH_VERSION -eq 1) { $url = $('https://github.com/git-for-windows/git/releases/download/v{0}.windows.{1}/MinGit-{0}-64-bit.zip' -f $env:GIT_VERSION, $env:GIT_PATCH_VERSION); } `