Skip to content

Commit 4e5eaea

Browse files
committed
Update ci, update dependencies
1 parent b4db64a commit 4e5eaea

11 files changed

+24
-18
lines changed

.github/workflows/linux-codeql.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
version: 17
104104

105105
steps:
106-
- uses: actions/checkout@v3
106+
- uses: actions/checkout@v4
107107

108108
- name: Dependencies
109109
run: |

.github/workflows/linux.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
version: 17
104104

105105
steps:
106-
- uses: actions/checkout@v3
106+
- uses: actions/checkout@v4
107107

108108
- name: Dependencies
109109
run: |
@@ -164,12 +164,13 @@ jobs:
164164

165165
- name: Archive Coverage
166166
if: matrix.compiler == 'clang' && matrix.config == 'Debug'
167-
uses: actions/upload-artifact@v3
167+
uses: actions/upload-artifact@v4
168168
with:
169169
name: coverage-linux
170170
path: |
171171
${{runner.workspace}}/build/tests/coverage.${{matrix.compiler}}-${{matrix.version}}.txt
172172
${{runner.workspace}}/build/tests/coverage.overview.${{matrix.compiler}}-${{matrix.version}}.txt
173+
overwrite: true
173174

174175
- name: Documentation
175176
working-directory: ${{runner.workspace}}/build

.github/workflows/macos-codeql.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
architecture: arm64
4848

4949
steps:
50-
- uses: actions/checkout@v3
50+
- uses: actions/checkout@v4
5151

5252
- name: Dependencies
5353
run: |

.github/workflows/macos.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
architecture: arm64
4848

4949
steps:
50-
- uses: actions/checkout@v3
50+
- uses: actions/checkout@v4
5151

5252
- name: Dependencies
5353
run: |
@@ -84,12 +84,13 @@ jobs:
8484

8585
# - name: Archive Coverage
8686
# if: matrix.config == 'Debug' && matrix.architecture != 'arm64'
87-
# uses: actions/upload-artifact@v3
87+
# uses: actions/upload-artifact@v4
8888
# with:
8989
# name: coverage-macos
9090
# path: |
9191
# ${{runner.workspace}}/build/tests/coverage.${{matrix.compiler}}-${{matrix.version}}.txt
9292
# ${{runner.workspace}}/build/tests/coverage.overview.${{matrix.compiler}}-${{matrix.version}}.txt
93+
# overwrite: true
9394

9495
- name: Documentation
9596
working-directory: ${{runner.workspace}}/build

.github/workflows/windows-codeql.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,14 @@ jobs:
6767
architecture: x64
6868

6969
steps:
70-
- uses: actions/checkout@v3
70+
- uses: actions/checkout@v4
7171
- uses: ilammy/msvc-dev-cmd@v1
7272
with:
7373
arch: ${{matrix.architecture}}
7474

7575
- name: Cache Dependencies
7676
id: cache-choco
77-
uses: actions/cache@v3
77+
uses: actions/cache@v4
7878
env:
7979
cache-name: cache-choco-packages
8080
with:

.github/workflows/windows.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,14 @@ jobs:
6767
architecture: x64
6868

6969
steps:
70-
- uses: actions/checkout@v3
70+
- uses: actions/checkout@v4
7171
- uses: ilammy/msvc-dev-cmd@v1
7272
with:
7373
arch: ${{matrix.architecture}}
7474

7575
- name: Cache Dependencies
7676
id: cache-choco
77-
uses: actions/cache@v3
77+
uses: actions/cache@v4
7878
env:
7979
cache-name: cache-choco-packages
8080
with:

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929
#
3030

31-
cmake_minimum_required(VERSION 3.18...3.27)
31+
cmake_minimum_required(VERSION 3.18...3.28)
3232

3333
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/policy.cmake)
3434
update_policy()

cmake/env.cmake

+8-5
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
option(CMAKE_VERBOSE_MAKEFILE "Show the complete build commands" OFF)
3333

3434
# possibility to disable build steps
35-
option(CORE_BUILD_EXAMPLES "Build examples for modern.cpp.core" ON)
36-
option(CORE_BUILD_TESTS "Build tests for modern.cpp.core" ON)
35+
option(CORE_BUILD_EXAMPLES "Build examples" ON)
36+
option(CORE_BUILD_TESTS "Build tests" ON)
3737

3838
# General
3939
set(CMAKE_TLS_VERIFY TRUE)
@@ -53,7 +53,8 @@ include(CheckCCompilerFlag)
5353
if(CMAKE_C_COMPILER_ID STREQUAL "MSVC" OR CMAKE_C_SIMULATE_ID STREQUAL "MSVC")
5454
check_c_compiler_flag(/std:c23 HAVE_FLAG_STD_C23)
5555
check_c_compiler_flag(/std:c17 HAVE_FLAG_STD_C17)
56-
if(CMAKE_C_COMPILER_ID MATCHES Clang)
56+
# Visual Studio 2019 will have clang-12, Visual Studio will have clang-15, but cmake do not know how to set the standard for that.
57+
if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_VERSION VERSION_LESS 16.0)
5758
set(HAVE_FLAG_STD_C23 OFF)
5859
endif()
5960
else()
@@ -75,8 +76,10 @@ set(CMAKE_C_EXTENSIONS OFF)
7576
include(CheckCXXCompilerFlag)
7677
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
7778
check_cxx_compiler_flag(/std:c++23 HAVE_FLAG_STD_CXX23)
79+
# An issue with visual studio 2019 with fetch project and same settings, so check early
7880
check_cxx_compiler_flag(/std:c++20 HAVE_FLAG_STD_CXX20)
79-
if(CMAKE_CXX_COMPILER_ID MATCHES Clang)
81+
# Visual Studio 2019 will have clang-12, but cmake do not know how to set the standard for that.
82+
if(CMAKE_CXX_COMPILER_ID MATCHES Clang AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0)
8083
set(HAVE_FLAG_STD_CXX23 OFF)
8184
endif()
8285
else()
@@ -113,7 +116,7 @@ if(CORE_MASTER_PROJECT AND CMAKE_BUILD_TYPE STREQUAL Release)
113116
endif()
114117
endif()
115118

116-
# Compiler configuration
119+
# Warning flags
117120
include(${CMAKE}/clang_warnings.cmake)
118121
include(${CMAKE}/gcc_warnings.cmake)
119122
include(${CMAKE}/msvc_warnings.cmake)

cmake/external/fmt.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ set(FMT_INCLUDE_DIR ${FMT_INSTALL}/include)
5454
ExternalProject_Add(fmt
5555
PREFIX ${FMT_SRC}
5656
GIT_REPOSITORY https://github.com/fmtlib/fmt.git
57-
GIT_TAG 10.1.1
57+
GIT_TAG 10.2.1
5858
GIT_SHALLOW 1
5959
CMAKE_ARGS
6060
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}

cmake/external/ranges.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ namespace std {
124124
namespace ranges {
125125
126126
using ::ranges::all_of\;
127+
using ::ranges::count\;
127128
using ::ranges::distance\;
128129
using ::ranges::find_if\;
129130
using ::ranges::for_each\;

cmake/fetch/doxygen-awesome-css.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ include(FetchContent)
3232

3333
FetchContent_Declare(doxygen-awesome-css
3434
GIT_REPOSITORY https://github.com/jothepro/doxygen-awesome-css.git
35-
GIT_TAG v2.2.1
35+
GIT_TAG v2.3.1
3636
GIT_SHALLOW 1
3737
)
3838

0 commit comments

Comments
 (0)