Skip to content

Commit 240fb14

Browse files
authored
Merge pull request #228 from OpenBrickProtocolFoundation/fix_msys2_virtual_package
Fix msys2 virtual package handling
2 parents a7a1703 + 38355ec commit 240fb14

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,10 @@ jobs:
135135
uses: Totto16/msys2-install-packages-pinned@v1
136136
with:
137137
msystem: ${{matrix.config.environment == 'mingw' && 'MINGW64' || 'UCRT64'}}
138-
install: gcc=14 gcc-libs=!
139-
138+
# gcc-libs 14 don't provbide the virtual package cc-libs, only gcc-libs 15 (see https://github.com/msys2/MINGW-packages/commit/9fa882f7eb6f639780a13df016497a93e45544ac) provide it, so until we use gcc 15, nghttp3 < 1.10.1 needs to be used (see https://github.com/msys2/MINGW-packages/commit/16b7f94772f29f1c207764701d863d266a5de64c) since 1.10.1 needs cc-libs and not gcc-libs. The newest version matching that constraint is 1.9.0
139+
install: |
140+
nghttp3=1.9
141+
gcc=14 gcc-libs=!
140142
141143
- name: Setup Clang (Linux) (libc++)
142144
if: matrix.config.os == 'ubuntu' && matrix.config.use-clang == true && matrix.config.use-clang_stdlib

.github/workflows/meson.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fetch-depth: '0'
1717

1818
- name: Check Files
19-
uses: Totto16/meson-format-action@1
19+
uses: Totto16/meson-format-action@v1
2020
with:
2121
format-file: ./meson.format
2222
only-git-files: true

0 commit comments

Comments
 (0)