From 419b4bd983de5f641af145716f9db5d00912d29c Mon Sep 17 00:00:00 2001 From: gabime Date: Tue, 26 Nov 2024 13:40:03 +0200 Subject: [PATCH] Updated ci to use c++17 --- .github/workflows/linux.yml | 5 ++--- .github/workflows/macos.yml | 4 ++-- .github/workflows/windows.yml | 13 ++----------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 4e97d077c..7c859d4ed 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -18,7 +18,6 @@ jobs: fail-fast: false matrix: config: - - { compiler: gcc, version: 7, build_type: Release, cppstd: 11 } - { compiler: gcc, version: 9, build_type: Release, cppstd: 17 } - { compiler: gcc, version: 11, build_type: Debug, cppstd: 20 } - { compiler: gcc, version: 12, build_type: Release, cppstd: 20 } @@ -67,7 +66,7 @@ jobs: # ----------------------------------------------------------------------- build_osx: runs-on: macOS-latest - name: "OS X Clang (C++11, Release)" + name: "OS X Clang (C++17, Release)" steps: - uses: actions/checkout@v4 - name: Build @@ -75,7 +74,7 @@ jobs: mkdir -p build && cd build cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CXX_STANDARD=11 \ + -DCMAKE_CXX_STANDARD=17 \ -DSPDLOG_BUILD_EXAMPLE=ON \ -DSPDLOG_BUILD_EXAMPLE_HO=ON \ -DSPDLOG_BUILD_WARNINGS=ON \ diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 60e9e745d..40decfb4d 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -8,7 +8,7 @@ permissions: jobs: build: runs-on: macOS-latest - name: "macOS Clang (C++11, Release)" + name: "macOS Clang (C++17, Release)" steps: - uses: actions/checkout@v4 - name: Build @@ -16,7 +16,7 @@ jobs: mkdir -p build && cd build cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CXX_STANDARD=11 \ + -DCMAKE_CXX_STANDARD=17 \ -DSPDLOG_BUILD_EXAMPLE=ON \ -DSPDLOG_BUILD_EXAMPLE_HO=ON \ -DSPDLOG_BUILD_WARNINGS=ON \ diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 710e40903..e4a3b3e2f 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -93,16 +93,7 @@ jobs: BUILD_EXAMPLE: 'ON' USE_STD_FORMAT: 'OFF' CXX_STANDARD: 17 - - GENERATOR: "Visual Studio 16 2019" - BUILD_TYPE: Release - BUILD_SHARED: 'ON' - FATAL_ERRORS: 'ON' - WCHAR: 'OFF' - WCHAR_FILES: 'OFF' - BUILD_EXAMPLE: 'ON' - USE_STD_FORMAT: 'OFF' - CXX_STANDARD: 14 - - GENERATOR: "Visual Studio 16 2019" + - GENERATOR: "Visual Studio 17 2022" BUILD_TYPE: Release BUILD_SHARED: 'ON' FATAL_ERRORS: 'ON' @@ -110,7 +101,7 @@ jobs: WCHAR_FILES: 'OFF' BUILD_EXAMPLE: 'ON' USE_STD_FORMAT: 'OFF' - CXX_STANDARD: 11 + CXX_STANDARD: 20 steps: - name: Checkout code