Skip to content

chore: maintenance for ci and library dependencies #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DeveloperPaul123 merged 6 commits into from
Jul 30, 2025
Merged

chore: maintenance for ci and library dependencies #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
edc0195
fix(ci): update to ubuntu-22.04
DeveloperPaul123 Jul 30, 2025
f26b882
fix(ci): using windows-latest for style check workflow
DeveloperPaul123 Jul 30, 2025
bda88e7
chore: update dep versions
DeveloperPaul123 Jul 30, 2025
6d2d9c5
fix: minor build issues after library updates
DeveloperPaul123 Jul 30, 2025
6af8dee
fix: missed reference to ubuntu-20.04
DeveloperPaul123 Jul 30, 2025
59ff93c
fix(ci): update the branch we target
DeveloperPaul123 Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ name: Install
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

env:
CTEST_OUTPUT_ON_FAILURE: 1
CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

env:
CPP_STANDARD: 20
Expand All @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/style.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Ubuntu
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

env:
CTEST_OUTPUT_ON_FAILURE: 1
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Windows
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

env:
CTEST_OUTPUT_ON_FAILURE: 1
Expand Down
2 changes: 1 addition & 1 deletion benchmark/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmake/CPM.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (~)
Expand Down
2 changes: 1 addition & 1 deletion examples/mandelbrot/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/mandelbrot/source/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions test/source/thread_pool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <algorithm>
#include <array>
#include <barrier>
#include <chrono>
#include <iostream>
#include <numeric>
#include <random>
Expand Down