Skip to content

Commit c35fea1

Browse files
committed
Updating cpp-library.
1 parent 11a7734 commit c35fea1

File tree

3 files changed

+54
-51
lines changed

3 files changed

+54
-51
lines changed

.github/workflows/ci.yml

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ name: CI
55

66
on:
77
push:
8-
branches: [ main, develop ]
8+
branches: [main, develop]
99
pull_request:
10-
branches: [ main ]
10+
branches: [main]
1111
release:
1212
types: [published]
1313

@@ -32,42 +32,42 @@ jobs:
3232
runs-on: ${{ matrix.os }}
3333

3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v5
3636

37-
- name: Configure CMake
38-
run: cmake --preset=test
37+
- name: Configure CMake
38+
run: cmake --preset=test
3939

40-
- name: Build
41-
run: cmake --build --preset=test
40+
- name: Build
41+
run: cmake --build --preset=test
4242

43-
- name: Test
44-
run: ctest --preset=test
43+
- name: Test
44+
run: ctest --preset=test
4545

4646
clang-tidy:
4747
runs-on: ubuntu-latest
48-
48+
4949
steps:
50-
- uses: actions/checkout@v4
50+
- uses: actions/checkout@v5
5151

52-
- name: Setup Ninja
53-
uses: ashutoshvarma/setup-ninja@master
52+
- name: Setup Ninja
53+
uses: ashutoshvarma/setup-ninja@v1
5454

55-
- name: Setup Clang
56-
uses: egor-tensin/setup-clang@v1
57-
with:
58-
version: latest
55+
- name: Setup Clang
56+
uses: egor-tensin/setup-clang@v1
57+
with:
58+
version: latest
5959

60-
- name: Install clang-tidy
61-
run: sudo apt-get update && sudo apt-get install -y clang-tidy
60+
- name: Install clang-tidy
61+
run: sudo apt-get update && sudo apt-get install -y clang-tidy
6262

63-
- name: Configure CMake with clang-tidy
64-
run: cmake --preset=clang-tidy
63+
- name: Configure CMake with clang-tidy
64+
run: cmake --preset=clang-tidy
6565

66-
- name: Build with clang-tidy
67-
run: cmake --build --preset=clang-tidy
66+
- name: Build with clang-tidy
67+
run: cmake --build --preset=clang-tidy
6868

69-
- name: Run tests with clang-tidy
70-
run: ctest --preset=clang-tidy
69+
- name: Run tests with clang-tidy
70+
run: ctest --preset=clang-tidy
7171

7272
docs:
7373
runs-on: ubuntu-latest
@@ -76,27 +76,27 @@ jobs:
7676
id-token: write
7777
pages: write
7878
contents: read
79-
79+
8080
steps:
81-
- uses: actions/checkout@v5
82-
83-
- name: Install Doxygen
84-
uses: ssciwr/doxygen-install@v1
85-
86-
- name: Configure CMake
87-
run: cmake --preset=docs
88-
89-
- name: Build Documentation
90-
run: cmake --build --preset=docs
91-
92-
- name: Setup Pages
93-
uses: actions/configure-pages@v5
94-
95-
- name: Upload artifact
96-
uses: actions/upload-pages-artifact@v3
97-
with:
98-
path: build/docs/html
99-
100-
- name: Deploy to GitHub Pages
101-
id: deployment
102-
uses: actions/deploy-pages@v4
81+
- uses: actions/checkout@v5
82+
83+
- name: Install Doxygen
84+
uses: ssciwr/doxygen-install@v1
85+
86+
- name: Configure CMake
87+
run: cmake --preset=docs
88+
89+
- name: Build Documentation
90+
run: cmake --build --preset=docs
91+
92+
- name: Setup Pages
93+
uses: actions/configure-pages@v5
94+
95+
- name: Upload artifact
96+
uses: actions/upload-pages-artifact@v4
97+
with:
98+
path: build/docs/html
99+
100+
- name: Deploy to GitHub Pages
101+
id: deployment
102+
uses: actions/deploy-pages@v4

CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ cmake_minimum_required(VERSION 3.20)
33
# Project declaration - cpp_library_setup will use this name and detect version from git tags
44
project(stlab-enum-ops)
55

6-
set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm CACHE PATH "CPM cache")
6+
# Setup cpp-library infrastructure
7+
if(PROJECT_IS_TOP_LEVEL)
8+
set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm CACHE PATH "CPM cache")
9+
endif()
710
include(cmake/CPM.cmake)
811

912
# Fetch cpp-library via CPM
@@ -13,7 +16,7 @@ include(cmake/CPM.cmake)
1316
# NAME cpp-library
1417
# URL "${CMAKE_SOURCE_DIR}/../cpp-library"
1518
# )
16-
CPMAddPackage("gh:stlab/[email protected].3")
19+
CPMAddPackage("gh:stlab/[email protected].4")
1720
include(${cpp-library_SOURCE_DIR}/cpp-library.cmake)
1821

1922
# Let cpp-library handle the project declaration and version detection

include/stlab/enum_ops.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ auto stlab_enable_bitmask_enum(...) -> std::false_type;
134134
/// arithmetic operators.
135135
auto stlab_enable_arithmetic_enum(...) -> std::false_type;
136136

137-
// Don't use the `\ deprecated` Doxygen tag here because clang will warn that the
137+
// Don't use the `\deprecated` Doxygen tag here because clang will warn that the
138138
// documentation marks the operations deprecated but the deprecated attribute is missing.
139139

140140
/// \note Use is **deprecated**. Use stlab_enable_bitmask_enum instead.

0 commit comments

Comments
 (0)