Skip to content

feat: Pin MSYS2 package version in CI #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 15, 2025
Merged

feat: Pin MSYS2 package version in CI #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aacd2ad
feat: use a self created github action, to pin msys2 packages to a ce…
Totto16 May 15, 2025
c23a7aa
fix: remove the ci config, that requires gcc 15 for msys2, use gcc 14…
Totto16 May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,13 @@ jobs:
arch: x64
toolset: '14.43'

- name: Setup MYSYS2 (Windows)
- name: Setup MSYS2 (Windows)
if: matrix.config.os == 'windows' && ( matrix.config.environment == 'mingw' || matrix.config.environment == 'ucrt' )
uses: msys2/setup-msys2@v2
with:
msystem: ${{matrix.config.environment == 'mingw' && 'MINGW64' || 'UCRT64'}}
update: true
install: >-
mingw-w64-${{matrix.config.architecture}}-gcc
mingw-w64-${{matrix.config.architecture}}-ninja
mingw-w64-${{matrix.config.architecture}}-python
mingw-w64-${{matrix.config.architecture}}-python-pip
Expand All @@ -131,6 +130,14 @@ jobs:
mingw-w64-${{matrix.config.architecture}}-cmake
git

- name: Setup GCC (MSYS2)
if: matrix.config.os == 'windows' && ( matrix.config.environment == 'mingw' || matrix.config.environment == 'ucrt' )
uses: Totto16/msys2-install-packages-pinned@v1
with:
msystem: ${{matrix.config.environment == 'mingw' && 'MINGW64' || 'UCRT64'}}
install: gcc=14 gcc-libs=!


- name: Setup Clang (Linux) (libc++)
if: matrix.config.os == 'ubuntu' && matrix.config.use-clang == true && matrix.config.use-clang_stdlib
run: |
Expand Down
8 changes: 1 addition & 7 deletions tools/options/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,7 @@ if get_option('run_in_ci')
'compilers': [msvc_compiler_current],
},
'msys2': {
# TODO: this needs to be 14, but we can't pin the package atm, see https://github.com/OpenBrickProtocolFoundation/oopetris/pull/224
'compilers': [
{
'id': 'gcc',
'checks': ['>=15', '<16'],
},
],
'compilers': [gcc_14_compiler],
},
'linux': {
'compilers': [clang_19_compiler, gcc_14_compiler],
Expand Down
Loading