diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml index 30058f8..c2bb525 100644 --- a/.github/workflows/install.yml +++ b/.github/workflows/install.yml @@ -3,10 +3,10 @@ name: Install on: push: branches: - - master + - main pull_request: branches: - - master + - main env: CTEST_OUTPUT_ON_FAILURE: 1 @@ -14,7 +14,7 @@ env: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: CPP_STANDARD: 20 @@ -32,7 +32,7 @@ jobs: with: version: 11 platform: x64 - + - name: build and install library run: | cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DTP_BUILD_EXAMPLES=OFF -DTP_BUILD_TESTS=ON -DTP_BUILD_BENCHMARKS=OFF -DCMAKE_INSTALL_PREFIX="/usr/local" diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index 10566a7..67ac01a 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -3,17 +3,17 @@ name: Style on: push: branches: - - master + - main pull_request: branches: - - master + - main env: CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules jobs: build: - runs-on: windows-2019 + runs-on: windows-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index cbc6884..de49287 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -3,10 +3,10 @@ name: Ubuntu on: push: branches: - - master + - main pull_request: branches: - - master + - main env: CTEST_OUTPUT_ON_FAILURE: 1 @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, ubuntu-latest] + os: [ubuntu-22.04, ubuntu-latest] version: [11] include: - os: ubuntu-latest @@ -72,14 +72,14 @@ jobs: build-clang: name: "clang-${{matrix.version}}" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: CPP_STANDARD: 20 strategy: fail-fast: false max-parallel: 4 matrix: - version: [14, 15, 16, 17, 18] + version: [14, 15, 16, 17, 18, 19] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e3b7e49..82a70ae 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -3,10 +3,10 @@ name: Windows on: push: branches: - - master + - main pull_request: branches: - - master + - main env: CTEST_OUTPUT_ON_FAILURE: 1 diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt index b3c3c70..a23955f 100644 --- a/benchmark/CMakeLists.txt +++ b/benchmark/CMakeLists.txt @@ -15,7 +15,7 @@ CPMAddPackage( GIT_SHALLOW ) -CPMAddPackage("gh:doctest/doctest@2.4.11") +CPMAddPackage("gh:doctest/doctest@2.4.12") CPMAddPackage( NAME bshoshany GITHUB_REPOSITORY bshoshany/thread-pool diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake index 37550b6..c961ea6 100644 --- a/cmake/CPM.cmake +++ b/cmake/CPM.cmake @@ -1,4 +1,4 @@ -set(CPM_DOWNLOAD_VERSION 0.40.2) +set(CPM_DOWNLOAD_VERSION 0.42.0) if(CPM_SOURCE_CACHE) # Expand relative path. This is important if the provided path contains a tilde (~) diff --git a/examples/mandelbrot/CMakeLists.txt b/examples/mandelbrot/CMakeLists.txt index 45a0789..dae8396 100644 --- a/examples/mandelbrot/CMakeLists.txt +++ b/examples/mandelbrot/CMakeLists.txt @@ -12,7 +12,7 @@ include(../../cmake/CPM.cmake) CPMAddPackage( GITHUB_REPOSITORY jarro2783/cxxopts - VERSION 2.2.1 + VERSION 3.3.1 OPTIONS "CXXOPTS_BUILD_EXAMPLES NO" "CXXOPTS_BUILD_TESTS NO" "CXXOPTS_ENABLE_INSTALL YES" ) diff --git a/examples/mandelbrot/source/main.cpp b/examples/mandelbrot/source/main.cpp index 38147ad..2e7f09c 100644 --- a/examples/mandelbrot/source/main.cpp +++ b/examples/mandelbrot/source/main.cpp @@ -83,7 +83,7 @@ auto main(int argc, char **argv) -> int { mandelbrot_threadpool(image_size, image_size, max_iterations, output_file_name); - } catch (const cxxopts::OptionException &e) { + } catch (const cxxopts::exceptions::exception &e) { std::cout << "error parsing options: " << e.what() << std::endl; exit(1); } diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 60d5d3f..1fe084b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -13,10 +13,10 @@ include(../cmake/tools.cmake) include(../cmake/CPM.cmake) -CPMAddPackage("gh:doctest/doctest@2.4.11") +CPMAddPackage("gh:doctest/doctest@2.4.12") CPMAddPackage( NAME Format.cmake - VERSION 1.7.3 + VERSION 1.8.3 GITHUB_REPOSITORY TheLartians/Format.cmake OPTIONS # skip CMake formatting for now diff --git a/test/source/thread_pool.cpp b/test/source/thread_pool.cpp index 1cffabb..48c1a64 100644 --- a/test/source/thread_pool.cpp +++ b/test/source/thread_pool.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include