Skip to content

Commit 03f4b67

Browse files
chore: maintenance for ci and library dependencies (#78)
1 parent 0b5653b commit 03f4b67

File tree

10 files changed

+21
-20
lines changed

10 files changed

+21
-20
lines changed

.github/workflows/install.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ name: Install
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88
branches:
9-
- master
9+
- main
1010

1111
env:
1212
CTEST_OUTPUT_ON_FAILURE: 1
1313
CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules
1414

1515
jobs:
1616
build:
17-
runs-on: ubuntu-20.04
17+
runs-on: ubuntu-22.04
1818

1919
env:
2020
CPP_STANDARD: 20
@@ -32,7 +32,7 @@ jobs:
3232
with:
3333
version: 11
3434
platform: x64
35-
35+
3636
- name: build and install library
3737
run: |
3838
cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DTP_BUILD_EXAMPLES=OFF -DTP_BUILD_TESTS=ON -DTP_BUILD_BENCHMARKS=OFF -DCMAKE_INSTALL_PREFIX="/usr/local"

.github/workflows/style.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ name: Style
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88
branches:
9-
- master
9+
- main
1010

1111
env:
1212
CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules
1313

1414
jobs:
1515
build:
16-
runs-on: windows-2019
16+
runs-on: windows-latest
1717

1818
steps:
1919
- uses: actions/checkout@v3

.github/workflows/ubuntu.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: Ubuntu
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88
branches:
9-
- master
9+
- main
1010

1111
env:
1212
CTEST_OUTPUT_ON_FAILURE: 1
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
os: [ubuntu-20.04, ubuntu-latest]
25+
os: [ubuntu-22.04, ubuntu-latest]
2626
version: [11]
2727
include:
2828
- os: ubuntu-latest
@@ -72,14 +72,14 @@ jobs:
7272

7373
build-clang:
7474
name: "clang-${{matrix.version}}"
75-
runs-on: ubuntu-20.04
75+
runs-on: ubuntu-22.04
7676
env:
7777
CPP_STANDARD: 20
7878
strategy:
7979
fail-fast: false
8080
max-parallel: 4
8181
matrix:
82-
version: [14, 15, 16, 17, 18]
82+
version: [14, 15, 16, 17, 18, 19]
8383

8484
steps:
8585
- uses: actions/checkout@v3

.github/workflows/windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: Windows
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88
branches:
9-
- master
9+
- main
1010

1111
env:
1212
CTEST_OUTPUT_ON_FAILURE: 1

benchmark/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ CPMAddPackage(
1515
GIT_SHALLOW
1616
)
1717

18-
CPMAddPackage("gh:doctest/[email protected].11")
18+
CPMAddPackage("gh:doctest/[email protected].12")
1919
CPMAddPackage(
2020
NAME bshoshany
2121
GITHUB_REPOSITORY bshoshany/thread-pool

cmake/CPM.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set(CPM_DOWNLOAD_VERSION 0.40.2)
1+
set(CPM_DOWNLOAD_VERSION 0.42.0)
22

33
if(CPM_SOURCE_CACHE)
44
# Expand relative path. This is important if the provided path contains a tilde (~)

examples/mandelbrot/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ include(../../cmake/CPM.cmake)
1212

1313
CPMAddPackage(
1414
GITHUB_REPOSITORY jarro2783/cxxopts
15-
VERSION 2.2.1
15+
VERSION 3.3.1
1616
OPTIONS "CXXOPTS_BUILD_EXAMPLES NO" "CXXOPTS_BUILD_TESTS NO" "CXXOPTS_ENABLE_INSTALL YES"
1717
)
1818

examples/mandelbrot/source/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ auto main(int argc, char **argv) -> int {
8383

8484
mandelbrot_threadpool(image_size, image_size, max_iterations, output_file_name);
8585

86-
} catch (const cxxopts::OptionException &e) {
86+
} catch (const cxxopts::exceptions::exception &e) {
8787
std::cout << "error parsing options: " << e.what() << std::endl;
8888
exit(1);
8989
}

test/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ include(../cmake/tools.cmake)
1313

1414
include(../cmake/CPM.cmake)
1515

16-
CPMAddPackage("gh:doctest/[email protected].11")
16+
CPMAddPackage("gh:doctest/[email protected].12")
1717
CPMAddPackage(
1818
NAME Format.cmake
19-
VERSION 1.7.3
19+
VERSION 1.8.3
2020
GITHUB_REPOSITORY TheLartians/Format.cmake
2121
OPTIONS
2222
# skip CMake formatting for now

test/source/thread_pool.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <algorithm>
77
#include <array>
88
#include <barrier>
9+
#include <chrono>
910
#include <iostream>
1011
#include <numeric>
1112
#include <random>

0 commit comments

Comments
 (0)