diff --git a/.github/workflows/.windows.yml b/.github/workflows/.windows.yml index a16247e38d..4d1036e6a8 100644 --- a/.github/workflows/.windows.yml +++ b/.github/workflows/.windows.yml @@ -32,8 +32,8 @@ env: GOTESTLIST_VERSION: v0.3.1 TESTSTAT_VERSION: v0.1.25 WINDOWS_BASE_IMAGE: mcr.microsoft.com/windows/servercore - WINDOWS_BASE_TAG_2019: ltsc2019 WINDOWS_BASE_TAG_2022: ltsc2022 + WINDOWS_BASE_TAG_2025: ltsc2025 TEST_IMAGE_NAME: moby:test TEST_CTN_NAME: moby DOCKER_BUILDKIT: 0 @@ -65,8 +65,8 @@ jobs: run: | New-Item -ItemType "directory" -Path "${{ github.workspace }}\go-build" New-Item -ItemType "directory" -Path "${{ github.workspace }}\go\pkg\mod" - If ("${{ inputs.os }}" -eq "windows-2019") { - echo "WINDOWS_BASE_IMAGE_TAG=${{ env.WINDOWS_BASE_TAG_2019 }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append + If ("${{ inputs.os }}" -eq "windows-2025") { + echo "WINDOWS_BASE_IMAGE_TAG=${{ env.WINDOWS_BASE_TAG_2025 }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append } ElseIf ("${{ inputs.os }}" -eq "windows-2022") { echo "WINDOWS_BASE_IMAGE_TAG=${{ env.WINDOWS_BASE_TAG_2022 }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append } @@ -144,8 +144,8 @@ jobs: New-Item -ItemType "directory" -Path "${{ github.workspace }}\go-build" New-Item -ItemType "directory" -Path "${{ github.workspace }}\go\pkg\mod" New-Item -ItemType "directory" -Path "bundles" - If ("${{ inputs.os }}" -eq "windows-2019") { - echo "WINDOWS_BASE_IMAGE_TAG=${{ env.WINDOWS_BASE_TAG_2019 }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append + If ("${{ inputs.os }}" -eq "windows-2025") { + echo "WINDOWS_BASE_IMAGE_TAG=${{ env.WINDOWS_BASE_TAG_2025 }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append } ElseIf ("${{ inputs.os }}" -eq "windows-2022") { echo "WINDOWS_BASE_IMAGE_TAG=${{ env.WINDOWS_BASE_TAG_2022 }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append } @@ -319,8 +319,8 @@ jobs: name: Init run: | New-Item -ItemType "directory" -Path "bundles" - If ("${{ inputs.os }}" -eq "windows-2019") { - echo "WINDOWS_BASE_IMAGE_TAG=${{ env.WINDOWS_BASE_TAG_2019 }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append + If ("${{ inputs.os }}" -eq "windows-2025") { + echo "WINDOWS_BASE_IMAGE_TAG=${{ env.WINDOWS_BASE_TAG_2025 }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append } ElseIf ("${{ inputs.os }}" -eq "windows-2022") { echo "WINDOWS_BASE_IMAGE_TAG=${{ env.WINDOWS_BASE_TAG_2022 }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append } diff --git a/.github/workflows/windows-2022.yml b/.github/workflows/windows-2022.yml index 2ed31d50b3..bc193e8455 100644 --- a/.github/workflows/windows-2022.yml +++ b/.github/workflows/windows-2022.yml @@ -14,13 +14,9 @@ concurrency: cancel-in-progress: true on: + schedule: + - cron: '0 10 * * *' workflow_dispatch: - push: - branches: - - 'master' - - '[0-9]+.[0-9]+' - - '[0-9]+.x' - pull_request: jobs: validate-dco: diff --git a/.github/workflows/windows-2019.yml b/.github/workflows/windows-2025.yml similarity index 86% rename from .github/workflows/windows-2019.yml rename to .github/workflows/windows-2025.yml index 64df7485ba..20af30d0e4 100644 --- a/.github/workflows/windows-2019.yml +++ b/.github/workflows/windows-2025.yml @@ -1,4 +1,4 @@ -name: windows-2019 +name: windows-2025 # Default to 'contents: read', which grants actions to read commits. # @@ -14,9 +14,13 @@ concurrency: cancel-in-progress: true on: - schedule: - - cron: '0 10 * * *' workflow_dispatch: + push: + branches: + - 'master' + - '[0-9]+.[0-9]+' + - '[0-9]+.x' + pull_request: jobs: validate-dco: @@ -37,6 +41,6 @@ jobs: matrix: storage: ${{ fromJson(needs.test-prepare.outputs.matrix) }} with: - os: windows-2019 + os: windows-2025 storage: ${{ matrix.storage }} send_coverage: false