Skip to content

Commit be00f87

Browse files
committed
Require Boost 1.73
An undefined `PTHREAD_STACK_MIN` causes a compile failure otherwise.
1 parent d6ed079 commit be00f87

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

.github/workflows/unit-tests.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2005 - 2021 Settlers Freaks <sf-team at siedler25.org>
1+
# Copyright (C) 2005 - 2025 Settlers Freaks <sf-team at siedler25.org>
22
#
33
# SPDX-License-Identifier: GPL-2.0-or-later
44

@@ -12,9 +12,6 @@ concurrency:
1212
group: ${{format('tests-{0}:{1}', github.repository, github.ref)}}
1313
cancel-in-progress: true
1414

15-
env:
16-
BOOST_VERSION: 1.69.0
17-
1815
defaults:
1916
run:
2017
shell: bash
@@ -44,16 +41,16 @@ jobs:
4441
strategy:
4542
matrix:
4643
include:
47-
- { compiler: gcc-9, os: ubuntu-22.04, buildType: Release }
48-
- { compiler: gcc-9, os: ubuntu-22.04, buildType: Debug, coverage: true }
49-
- { compiler: clang, os: macos-13, buildType: Debug, boostVersion: 1.81.0 } # New libc++ only supported since 1.81
44+
- { compiler: gcc-9, os: ubuntu-22.04, buildType: Release, boostVersion: 1.73.0 }
45+
- { compiler: gcc-9, os: ubuntu-22.04, buildType: Debug, boostVersion: 1.73.0, coverage: true }
46+
- { compiler: clang, os: macos-13, buildType: Debug, boostVersion: 1.81.0 } # New libc++ only supported since 1.81
5047
# Latest GCC
51-
- { compiler: gcc-13, os: ubuntu-24.04, buildType: Debug, boostVersion: 1.87.0 }
48+
- { compiler: gcc-13, os: ubuntu-24.04, buildType: Debug, boostVersion: 1.87.0 }
5249
# Latest Clang
53-
- { compiler: clang-12, os: ubuntu-22.04, buildType: Debug, boostVersion: 1.73.0 }
50+
- { compiler: clang-12, os: ubuntu-22.04, buildType: Debug, boostVersion: 1.73.0 }
5451
# Windows
55-
- { compiler: msvc, os: windows-2019, buildType: Debug, generator: 'Visual Studio 16 2019' }
56-
- { compiler: msvc, os: windows-2022, buildType: Debug, boostVersion: 1.87.0 }
52+
- { compiler: msvc, os: windows-2019, buildType: Debug, boostVersion: 1.73.0, generator: 'Visual Studio 16 2019' }
53+
- { compiler: msvc, os: windows-2022, buildType: Debug, boostVersion: 1.87.0 }
5754

5855
runs-on: ${{matrix.os}}
5956
env:

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ endif()
3535

3636

3737
include(RttrBoostCfg)
38-
find_package(Boost 1.69 REQUIRED COMPONENTS system filesystem iostreams)
38+
find_package(Boost 1.73 REQUIRED COMPONENTS system filesystem iostreams)
3939

4040
include(RttrTestingCfg)
4141
if(isTopLevel)

0 commit comments

Comments
 (0)