From c4c649389c083ea284e2e2e7d9c6a3ad371ae913 Mon Sep 17 00:00:00 2001 From: "Bassam (Sam) Khouri" Date: Thu, 27 Mar 2025 19:34:12 -0400 Subject: [PATCH] Revert "Revert "Update Git version in some windows Docker images (#450)" (#451)" This reverts commit 97fa0e3d1c59b789d20bc75edddb1a432cdc1a35. --- nightly-6.0/windows/1809/Dockerfile | 4 ++-- nightly-6.0/windows/LTSC2022/Dockerfile | 4 ++-- nightly-6.1/windows/1809/Dockerfile | 4 ++-- nightly-6.1/windows/LTSC2022/Dockerfile | 4 ++-- nightly-main/windows/1809/Dockerfile | 4 ++-- nightly-main/windows/LTSC2022/Dockerfile | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/nightly-6.0/windows/1809/Dockerfile b/nightly-6.0/windows/1809/Dockerfile index a4b80863..d867981f 100644 --- a/nightly-6.0/windows/1809/Dockerfile +++ b/nightly-6.0/windows/1809/Dockerfile @@ -15,8 +15,8 @@ RUN reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /t # Install Git. # See: git-[version]-[bit].exe /SAVEINF=git.inf and /? -ARG GIT=https://github.com/git-for-windows/git/releases/download/v2.42.0.windows.2/Git-2.42.0.2-64-bit.exe -ARG GIT_SHA256=BD9B41641A258FD16D99BEECEC66132160331D685DFB4C714CEA2BCC78D63BDB +ARG GIT=https://github.com/git-for-windows/git/releases/download/v2.49.0.windows.1/Git-2.49.0-64-bit.exe +ARG GIT_SHA256=726056328967F242FE6E9AFBFE7823903A928AFF577DCF6F517F2FB6DA6CE83C RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:GIT}); \ Invoke-WebRequest -Uri ${env:GIT} -OutFile git.exe; \ Write-Host '✓'; \ diff --git a/nightly-6.0/windows/LTSC2022/Dockerfile b/nightly-6.0/windows/LTSC2022/Dockerfile index ca53da72..f3ca5eb5 100644 --- a/nightly-6.0/windows/LTSC2022/Dockerfile +++ b/nightly-6.0/windows/LTSC2022/Dockerfile @@ -15,8 +15,8 @@ RUN reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /t # Install Git. # See: git-[version]-[bit].exe /SAVEINF=git.inf and /? -ARG GIT=https://github.com/git-for-windows/git/releases/download/v2.42.0.windows.2/Git-2.42.0.2-64-bit.exe -ARG GIT_SHA256=BD9B41641A258FD16D99BEECEC66132160331D685DFB4C714CEA2BCC78D63BDB +ARG GIT=https://github.com/git-for-windows/git/releases/download/v2.49.0.windows.1/Git-2.49.0-64-bit.exe +ARG GIT_SHA256=726056328967F242FE6E9AFBFE7823903A928AFF577DCF6F517F2FB6DA6CE83C RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:GIT}); \ Invoke-WebRequest -Uri ${env:GIT} -OutFile git.exe; \ Write-Host '✓'; \ diff --git a/nightly-6.1/windows/1809/Dockerfile b/nightly-6.1/windows/1809/Dockerfile index 65552b6b..e2bc03f8 100644 --- a/nightly-6.1/windows/1809/Dockerfile +++ b/nightly-6.1/windows/1809/Dockerfile @@ -15,8 +15,8 @@ RUN reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /t # Install Git. # See: git-[version]-[bit].exe /SAVEINF=git.inf and /? -ARG GIT=https://github.com/git-for-windows/git/releases/download/v2.42.0.windows.2/Git-2.42.0.2-64-bit.exe -ARG GIT_SHA256=BD9B41641A258FD16D99BEECEC66132160331D685DFB4C714CEA2BCC78D63BDB +ARG GIT=https://github.com/git-for-windows/git/releases/download/v2.49.0.windows.1/Git-2.49.0-64-bit.exe +ARG GIT_SHA256=726056328967F242FE6E9AFBFE7823903A928AFF577DCF6F517F2FB6DA6CE83C RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:GIT}); \ Invoke-WebRequest -Uri ${env:GIT} -OutFile git.exe; \ Write-Host '✓'; \ diff --git a/nightly-6.1/windows/LTSC2022/Dockerfile b/nightly-6.1/windows/LTSC2022/Dockerfile index bab3f9e2..ed7b8bb3 100644 --- a/nightly-6.1/windows/LTSC2022/Dockerfile +++ b/nightly-6.1/windows/LTSC2022/Dockerfile @@ -15,8 +15,8 @@ RUN reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /t # Install Git. # See: git-[version]-[bit].exe /SAVEINF=git.inf and /? -ARG GIT=https://github.com/git-for-windows/git/releases/download/v2.42.0.windows.2/Git-2.42.0.2-64-bit.exe -ARG GIT_SHA256=BD9B41641A258FD16D99BEECEC66132160331D685DFB4C714CEA2BCC78D63BDB +ARG GIT=https://github.com/git-for-windows/git/releases/download/v2.49.0.windows.1/Git-2.49.0-64-bit.exe +ARG GIT_SHA256=726056328967F242FE6E9AFBFE7823903A928AFF577DCF6F517F2FB6DA6CE83C RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:GIT}); \ Invoke-WebRequest -Uri ${env:GIT} -OutFile git.exe; \ Write-Host '✓'; \ diff --git a/nightly-main/windows/1809/Dockerfile b/nightly-main/windows/1809/Dockerfile index 62196aa0..5ef600bf 100644 --- a/nightly-main/windows/1809/Dockerfile +++ b/nightly-main/windows/1809/Dockerfile @@ -15,8 +15,8 @@ RUN reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /t # Install Git. # See: git-[version]-[bit].exe /SAVEINF=git.inf and /? -ARG GIT=https://github.com/git-for-windows/git/releases/download/v2.42.0.windows.2/Git-2.42.0.2-64-bit.exe -ARG GIT_SHA256=BD9B41641A258FD16D99BEECEC66132160331D685DFB4C714CEA2BCC78D63BDB +ARG GIT=https://github.com/git-for-windows/git/releases/download/v2.49.0.windows.1/Git-2.49.0-64-bit.exe +ARG GIT_SHA256=726056328967F242FE6E9AFBFE7823903A928AFF577DCF6F517F2FB6DA6CE83C RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:GIT}); \ Invoke-WebRequest -Uri ${env:GIT} -OutFile git.exe; \ Write-Host '✓'; \ diff --git a/nightly-main/windows/LTSC2022/Dockerfile b/nightly-main/windows/LTSC2022/Dockerfile index 54bd974f..b1af4a39 100644 --- a/nightly-main/windows/LTSC2022/Dockerfile +++ b/nightly-main/windows/LTSC2022/Dockerfile @@ -15,8 +15,8 @@ RUN reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /t # Install Git. # See: git-[version]-[bit].exe /SAVEINF=git.inf and /? -ARG GIT=https://github.com/git-for-windows/git/releases/download/v2.42.0.windows.2/Git-2.42.0.2-64-bit.exe -ARG GIT_SHA256=BD9B41641A258FD16D99BEECEC66132160331D685DFB4C714CEA2BCC78D63BDB +ARG GIT=https://github.com/git-for-windows/git/releases/download/v2.49.0.windows.1/Git-2.49.0-64-bit.exe +ARG GIT_SHA256=726056328967F242FE6E9AFBFE7823903A928AFF577DCF6F517F2FB6DA6CE83C RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:GIT}); \ Invoke-WebRequest -Uri ${env:GIT} -OutFile git.exe; \ Write-Host '✓'; \