Skip to content

Commit 66792b2

Browse files
committed
CI: Update the Windows CI setup to build Docker images on both Windows 2022 and 2025
1 parent 9078d41 commit 66792b2

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

.github/workflows/windows.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,19 @@ jobs:
2727
if: needs.build_windows.result != 'success'
2828
build_windows:
2929
timeout-minutes: 60
30-
name: build_windows / ${{ matrix.image }}-windows-${{ matrix.arch }}
31-
runs-on: windows-2022
30+
name: build_windows / ${{ matrix.image }}-windows${{ matrix.windows-version }}-${{ matrix.arch }}
31+
runs-on: windows-${{ matrix.windows-version }}
3232
strategy:
3333
fail-fast: false
3434
matrix:
35-
include:
36-
- image: 'package'
37-
arch: 'x86_64'
38-
- image: 'package'
39-
arch: 'i686'
35+
image:
36+
- package
37+
arch:
38+
- x86_64
39+
- i686
40+
windows-version:
41+
- '2022'
42+
- '2025'
4043
steps:
4144
- uses: actions/checkout@v4
4245
with:
@@ -54,7 +57,7 @@ jobs:
5457
Write-Output "TAG_NAME=${{ github.sha }}" >> $env:GITHUB_ENV
5558
}
5659
Write-Output "IMAGE_NAME=juliapackaging/${{ matrix.image }}-windows-${{ matrix.arch }}" >> $env:GITHUB_ENV
57-
- run: docker build -t ${{ env.IMAGE_NAME }}:${{ env.TAG_NAME }} .
60+
- run: docker build -f Dockerfile.${{ matrix.windows-version }} -t ${{ env.IMAGE_NAME }}:${{ env.TAG_NAME }} .
5861
working-directory: windows/${{ matrix.image }}-${{ matrix.arch }}
5962
- run: docker tag ${{ env.IMAGE_NAME }}:${{ env.TAG_NAME }} ${{ env.IMAGE_NAME }}:latest
6063

0 commit comments

Comments
 (0)