Merge pull request #481 from jenkinsci/updatecli_fb78da795f3c7c214177…

…35cd0ed3cf3627c1aa571c6a3326dda3d02c2a8d8265 Bump Git version on Windows to 2.42.0.windows.1
jenkinsci · Aug 28, 2023 · ed85346 · ed85346
2 parents a4c1212 + e81f0d5
commit ed85346
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/windows/nanoserver/Dockerfile b/windows/nanoserver/Dockerfile
@@ -38,8 +38,8 @@ COPY --from=jdk-core $JAVA_HOME $JAVA_HOME
 SHELL ["pwsh.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 USER ContainerAdministrator
 
-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/Dockerfile b/windows/windowsservercore/Dockerfile
@@ -35,8 +35,8 @@ COPY --from=jdk-core $JAVA_HOME $JAVA_HOME
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-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); } `