Skip to content

Commit 6d7dc76

Browse files
authored
fixed #13782 - removed windows-2019 from CI (danmar#7529)
1 parent 9df3dfe commit 6d7dc76

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.github/workflows/CI-mingw.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ jobs:
2424
build_mingw:
2525
strategy:
2626
matrix:
27-
# the MinGW installation in windows-2019 is supposed to be 8.1 but it is 12.2
2827
# the MinGW installation in windows-2022 is not including all necessary packages by default, so just use the older image instead - package versions are he same
29-
os: [windows-2019]
28+
os: [windows-2022]
3029
fail-fast: false
3130

3231
runs-on: ${{ matrix.os }}
@@ -40,9 +39,12 @@ jobs:
4039
uses: msys2/setup-msys2@v2
4140
with:
4241
release: false # use pre-installed
42+
# TODO: install mingw-w64-x86_64-make and use mingw32.make instead - currently fails with "Windows Subsystem for Linux has no installed distributions."
4343
install: >-
4444
mingw-w64-x86_64-lld
4545
mingw-w64-x86_64-ccache
46+
make
47+
mingw-w64-x86_64-gcc
4648
4749
- name: ccache
4850
uses: hendrikmuhs/[email protected]

.github/workflows/CI-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
build_qt:
2727
strategy:
2828
matrix:
29-
os: [windows-2019, windows-2022]
29+
os: [windows-2022]
3030
qt_ver: [5.15.2, 6.8.2]
3131
fail-fast: false
3232

@@ -84,7 +84,7 @@ jobs:
8484
build:
8585
strategy:
8686
matrix:
87-
os: [windows-2019, windows-2022]
87+
os: [windows-2022]
8888
config: [debug, release]
8989
fail-fast: false
9090

0 commit comments

Comments
 (0)