Skip to content

Commit 3c8a79f

Browse files
authored
Merge branch 'master' into revert-496-revert-495-helpesk4557-disable-failing-test-for-now
2 parents 4144330 + 17bf244 commit 3c8a79f

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.github/workflows/updatecli.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ on:
33
# Allow to be run manually
44
workflow_dispatch:
55
schedule:
6-
# Run once per week (to avoid alert fatigue)
7-
- cron: '0 2 * * 1' # Every Monday at 2am UTC
6+
- cron: '0 1 * * *' # Once a day at 01:00am UTC
87
push:
98
pull_request:
109
jobs:

windows/nanoserver/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ RUN $javaMajorVersion = $env:JAVA_HOME.Substring($env:JAVA_HOME.Length - 2); `
6060
New-Item -Path "C:\jdk-${javaMajorVersion}" -ItemType SymbolicLink -Value "${env:JAVA_HOME}"
6161

6262
# Install git
63-
ARG GIT_VERSION=2.50.0
64-
ARG GIT_PATCH_VERSION=2
63+
ARG GIT_VERSION=2.50.1
64+
ARG GIT_PATCH_VERSION=1
6565
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
6666
# The patch "windows.1" always have a different URL than the subsequent patch (ZIP filename is different)
6767
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); } `

windows/windowsservercore/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ ENV JENKINS_AGENT_WORK=${JENKINS_AGENT_WORK}
5555
USER ContainerAdministrator
5656

5757
# Install git
58-
ARG GIT_VERSION=2.50.0
59-
ARG GIT_PATCH_VERSION=2
58+
ARG GIT_VERSION=2.50.1
59+
ARG GIT_PATCH_VERSION=1
6060
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
6161
# The patch "windows.1" always have a different URL than the subsequent patch (ZIP filename is different)
6262
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); } `

0 commit comments

Comments
 (0)