diff --git a/Makefile b/Makefile index 471b2bf8..2ec08f74 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ list: check-reqs @set -x; make --silent show | jq -r '.target | path(.. | select(.platforms[] | contains("linux/$(ARCH)"))?) | add' bats: - git clone --branch v1.11.0 https://github.com/bats-core/bats-core bats + git clone --branch v1.11.1 https://github.com/bats-core/bats-core bats prepare-test: bats check-reqs git submodule update --init --recursive diff --git a/windows/nanoserver/Dockerfile b/windows/nanoserver/Dockerfile index 4999166c..0b02c12e 100644 --- a/windows/nanoserver/Dockerfile +++ b/windows/nanoserver/Dockerfile @@ -60,8 +60,8 @@ RUN $javaMajorVersion = $env:JAVA_HOME.Substring($env:JAVA_HOME.Length - 2); ` New-Item -Path "C:\jdk-${javaMajorVersion}" -ItemType SymbolicLink -Value "${env:JAVA_HOME}" # Install git -ARG GIT_VERSION=2.47.0 -ARG GIT_PATCH_VERSION=2 +ARG GIT_VERSION=2.47.1 +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 index 7fa33205..6a8801a8 100644 --- a/windows/windowsservercore/Dockerfile +++ b/windows/windowsservercore/Dockerfile @@ -55,8 +55,8 @@ ENV JENKINS_AGENT_WORK ${JENKINS_AGENT_WORK} USER ContainerAdministrator # Install git -ARG GIT_VERSION=2.47.0 -ARG GIT_PATCH_VERSION=2 +ARG GIT_VERSION=2.47.1 +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); } `