Skip to content

Commit

Permalink
Merge branch 'master' into temurin-source
Browse files Browse the repository at this point in the history
  • Loading branch information
dduportal authored Dec 2, 2024
2 parents a6533e4 + fa1e5dc commit c72fe78
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions windows/nanoserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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); } `
Expand Down
4 changes: 2 additions & 2 deletions windows/windowsservercore/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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); } `
Expand Down

0 comments on commit c72fe78

Please sign in to comment.