Skip to content

Commit

Permalink
Update ci, update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
florianbecker committed Feb 16, 2024
1 parent b4db64a commit 4e5eaea
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux-codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
version: 17

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Dependencies
run: |
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
version: 17

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Dependencies
run: |
Expand Down Expand Up @@ -164,12 +164,13 @@ jobs:

- name: Archive Coverage
if: matrix.compiler == 'clang' && matrix.config == 'Debug'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage-linux
path: |
${{runner.workspace}}/build/tests/coverage.${{matrix.compiler}}-${{matrix.version}}.txt
${{runner.workspace}}/build/tests/coverage.overview.${{matrix.compiler}}-${{matrix.version}}.txt
overwrite: true

- name: Documentation
working-directory: ${{runner.workspace}}/build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos-codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
architecture: arm64

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Dependencies
run: |
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
architecture: arm64

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Dependencies
run: |
Expand Down Expand Up @@ -84,12 +84,13 @@ jobs:

# - name: Archive Coverage
# if: matrix.config == 'Debug' && matrix.architecture != 'arm64'
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: coverage-macos
# path: |
# ${{runner.workspace}}/build/tests/coverage.${{matrix.compiler}}-${{matrix.version}}.txt
# ${{runner.workspace}}/build/tests/coverage.overview.${{matrix.compiler}}-${{matrix.version}}.txt
# overwrite: true

- name: Documentation
working-directory: ${{runner.workspace}}/build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows-codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@ jobs:
architecture: x64

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ilammy/msvc-dev-cmd@v1
with:
arch: ${{matrix.architecture}}

- name: Cache Dependencies
id: cache-choco
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-choco-packages
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@ jobs:
architecture: x64

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ilammy/msvc-dev-cmd@v1
with:
arch: ${{matrix.architecture}}

- name: Cache Dependencies
id: cache-choco
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-choco-packages
with:
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

cmake_minimum_required(VERSION 3.18...3.27)
cmake_minimum_required(VERSION 3.18...3.28)

include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/policy.cmake)
update_policy()
Expand Down
13 changes: 8 additions & 5 deletions cmake/env.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
option(CMAKE_VERBOSE_MAKEFILE "Show the complete build commands" OFF)

# possibility to disable build steps
option(CORE_BUILD_EXAMPLES "Build examples for modern.cpp.core" ON)
option(CORE_BUILD_TESTS "Build tests for modern.cpp.core" ON)
option(CORE_BUILD_EXAMPLES "Build examples" ON)
option(CORE_BUILD_TESTS "Build tests" ON)

# General
set(CMAKE_TLS_VERIFY TRUE)
Expand All @@ -53,7 +53,8 @@ include(CheckCCompilerFlag)
if(CMAKE_C_COMPILER_ID STREQUAL "MSVC" OR CMAKE_C_SIMULATE_ID STREQUAL "MSVC")
check_c_compiler_flag(/std:c23 HAVE_FLAG_STD_C23)
check_c_compiler_flag(/std:c17 HAVE_FLAG_STD_C17)
if(CMAKE_C_COMPILER_ID MATCHES Clang)
# 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.
if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_VERSION VERSION_LESS 16.0)
set(HAVE_FLAG_STD_C23 OFF)
endif()
else()
Expand All @@ -75,8 +76,10 @@ set(CMAKE_C_EXTENSIONS OFF)
include(CheckCXXCompilerFlag)
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
check_cxx_compiler_flag(/std:c++23 HAVE_FLAG_STD_CXX23)
# An issue with visual studio 2019 with fetch project and same settings, so check early
check_cxx_compiler_flag(/std:c++20 HAVE_FLAG_STD_CXX20)
if(CMAKE_CXX_COMPILER_ID MATCHES Clang)
# Visual Studio 2019 will have clang-12, but cmake do not know how to set the standard for that.
if(CMAKE_CXX_COMPILER_ID MATCHES Clang AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0)
set(HAVE_FLAG_STD_CXX23 OFF)
endif()
else()
Expand Down Expand Up @@ -113,7 +116,7 @@ if(CORE_MASTER_PROJECT AND CMAKE_BUILD_TYPE STREQUAL Release)
endif()
endif()

# Compiler configuration
# Warning flags
include(${CMAKE}/clang_warnings.cmake)
include(${CMAKE}/gcc_warnings.cmake)
include(${CMAKE}/msvc_warnings.cmake)
Expand Down
2 changes: 1 addition & 1 deletion cmake/external/fmt.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ set(FMT_INCLUDE_DIR ${FMT_INSTALL}/include)
ExternalProject_Add(fmt
PREFIX ${FMT_SRC}
GIT_REPOSITORY https://github.com/fmtlib/fmt.git
GIT_TAG 10.1.1
GIT_TAG 10.2.1
GIT_SHALLOW 1
CMAKE_ARGS
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
Expand Down
1 change: 1 addition & 0 deletions cmake/external/ranges.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ namespace std {
namespace ranges {
using ::ranges::all_of\;
using ::ranges::count\;
using ::ranges::distance\;
using ::ranges::find_if\;
using ::ranges::for_each\;
Expand Down
2 changes: 1 addition & 1 deletion cmake/fetch/doxygen-awesome-css.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ include(FetchContent)

FetchContent_Declare(doxygen-awesome-css
GIT_REPOSITORY https://github.com/jothepro/doxygen-awesome-css.git
GIT_TAG v2.2.1
GIT_TAG v2.3.1
GIT_SHALLOW 1
)

Expand Down

0 comments on commit 4e5eaea

Please sign in to comment.