Merge pull request #221 from Morwenn/1.x.y-develop

Release 1.16.0

Author: Morwenn

.clang-tidy

@@ -0,0 +1,13 @@
+# Copyright (c) 2023 Morwenn
+# SPDX-License-Identifier: MIT
+
+# Disabled:
+#  -modernize-avoid-c-arrays: C arrays are cool enough
+Checks: >
+  -*,
+  bugprone-*,
+  clang-analyzer-*,
+  modernize-*,
+  performance-*,
+  portability-*,
+  -modernize-avoid-c-arrays

.github/workflows/build-macos.yml

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2022 Morwenn
+# Copyright (c) 2021-2024 Morwenn
 # SPDX-License-Identifier: MIT
 
 name: MacOS Builds
@@ -23,13 +23,13 @@ on:
 
 jobs:
   build:
-    runs-on: macos-11
+    runs-on: macos-12
 
     strategy:
       fail-fast: false
       matrix:
         cxx:
-          - g++-10
+          - g++-11
           - clang++
         config:
           # Release build
@@ -41,7 +41,7 @@ jobs:
             sanitize: undefined
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Configure CMake
         working-directory: ${{runner.workspace}}

.github/workflows/build-mingw.yml

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2022 Morwenn
+# Copyright (c) 2021-2024 Morwenn
 # SPDX-License-Identifier: MIT
 
 name: MinGW-w64 Builds
@@ -31,7 +31,7 @@ jobs:
         build_type: [Debug, Release]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Configure CMake
         shell: pwsh

.github/workflows/build-msvc.yml

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2022 Morwenn
+# Copyright (c) 2021-2024 Morwenn
 # SPDX-License-Identifier: MIT
 
 name: MSVC Builds
@@ -35,7 +35,7 @@ jobs:
           build_tools: '-T ClangCL'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Configure CMake
         shell: pwsh

.github/workflows/build-ubuntu.yml

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2022 Morwenn
+# Copyright (c) 2021-2024 Morwenn
 # SPDX-License-Identifier: MIT
 
 name: Ubuntu Builds
@@ -43,7 +43,7 @@ jobs:
             sanitize: undefined
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install GCC
         if: ${{matrix.cxx == 'g++-7'}}

.github/workflows/code-coverage.yml

@@ -1,14 +1,14 @@
-# Copyright (c) 2020-2022 Morwenn
+# Copyright (c) 2020-2024 Morwenn
 # SPDX-License-Identifier: MIT
 
 name: Coverage Upload to Codecov
 
 on:
   push:
     branches:
-      - master
-      - develop
-      - 2.0.0-develop
+      - 1.x.y-develop
+      - 1.x.y-stable
+      - 2.x.y-develop
     paths:
       - '.github/workflows/code-coverage.yml'
       - '.github/.codecov.yml'
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout project
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install LCOV
         run: sudo apt-get install -y lcov
@@ -57,6 +57,7 @@ jobs:
       - name: Upload coverage info
         uses: codecov/codecov-action@v3
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           directory: ${{runner.workspace}}/build/lcov/data
           files: '*.info'
           fail_ci_if_error: true

.github/workflows/deploy-to-wiki.yml

@@ -1,12 +1,12 @@
-# Copyright (c) 2020-2022 Morwenn
+# Copyright (c) 2020-2024 Morwenn
 # SPDX-License-Identifier: MIT
 
 name: Wiki Deployment
 
 on:
   push:
     branches:
-      - master
+      - 1.x.y-stable
     paths:
       - 'docs/**'
 
@@ -18,13 +18,13 @@ jobs:
 
     steps:
       - name: Checkout /docs
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{github.repository}}
           path: main
 
       - name: Checkout wiki
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{github.repository}}.wiki
           path: wiki

CMakeLists.txt

@@ -1,11 +1,11 @@
-# Copyright (c) 2015-2023 Morwenn
+# Copyright (c) 2015-2024 Morwenn
 # SPDX-License-Identifier: MIT
 
 cmake_minimum_required(VERSION 3.8.0)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-project(cpp-sort VERSION 1.15.0 LANGUAGES CXX)
+project(cpp-sort VERSION 1.16.0 LANGUAGES CXX)
 
 include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)
@@ -24,7 +24,7 @@ if (CPPSORT_USE_LIBASSERT)
     include(DownloadProject)
     download_project(PROJ libassert
                      GIT_REPOSITORY https://github.com/jeremy-rifkin/libassert
-                     GIT_TAG v1.2
+                     GIT_TAG v1.2.2
                      UPDATE_DISCONNECTED 1
     )
     add_subdirectory(${libassert_SOURCE_DIR} ${libassert_BINARY_DIR})

README.md

@@ -1,7 +1,7 @@
 ![cpp-sort logo](docs/images/cpp-sort-logo.svg)
 
-[![Latest Release](https://img.shields.io/badge/release-1.15.0-blue.svg)](https://github.com/Morwenn/cpp-sort/releases/tag/1.15.0)
-[![Conan Package](https://img.shields.io/badge/conan-cpp--sort%2F1.15.0-blue.svg)](https://conan.io/center/recipes/cpp-sort?version=1.15.0)
+[![Latest Release](https://img.shields.io/badge/release-1.16.0-blue.svg)](https://github.com/Morwenn/cpp-sort/releases/tag/1.16.0)
+[![Conan Package](https://img.shields.io/badge/conan-cpp--sort%2F1.16.0-blue.svg)](https://conan.io/center/recipes/cpp-sort?version=1.16.0)
 [![Code Coverage](https://codecov.io/gh/Morwenn/cpp-sort/branch/develop/graph/badge.svg)](https://codecov.io/gh/Morwenn/cpp-sort)
 [![Pitchfork Layout](https://img.shields.io/badge/standard-PFL-orange.svg)](https://github.com/vector-of-bool/pitchfork)
 

benchmarks/benchmarking-tools/cpu_cycles.h

@@ -21,7 +21,11 @@ template<typename Sorter>
 struct cpu_cycles:
     cppsort::utility::adapter_storage<Sorter>,
     cppsort::detail::check_iterator_category<Sorter>,
-    cppsort::detail::check_is_always_stable<Sorter>
+    cppsort::detail::check_is_always_stable<Sorter>,
+    cppsort::detail::sorter_facade_fptr<
+        cpu_cycles<Sorter>,
+        std::is_empty<Sorter>::value
+    >
 {
     using tag_t = cpu_cycles_tag;
     using metric_t = cppsort::utility::metric<unsigned long long, tag_t>;