Skip to content

Commit f7470b5

Browse files
committed
Install cargo for single header creation in github. Bumping clang-format to 16
1 parent 490069f commit f7470b5

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

.github/workflows/pipeline.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,22 @@ jobs:
4242
4343
sudo locale-gen de_DE.UTF-8
4444
45+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
46+
source "$HOME/.cargo/env"
47+
4548
- name: Configure build
4649
working-directory: ${{runner.workspace}}
4750
env:
4851
CC: ${{matrix.cc}}
4952
CXX: ${{matrix.cxx}}
5053
run: |
51-
cmake -Bbuild -H$GITHUB_WORKSPACE \
54+
cmake -Bbuild -H$GITHUB_WORKSPACE \
5255
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
53-
-DCMAKE_CXX_STANDARD=${{matrix.std}} \
54-
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
55-
-DCMAKE_CXX_EXTENSIONS=ON \
56-
-DDBC_TEST_LOCALE_INDEPENDENCE=ON
56+
-DCMAKE_CXX_STANDARD=${{matrix.std}} \
57+
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
58+
-DCMAKE_CXX_EXTENSIONS=ON \
59+
-DDBC_TEST_LOCALE_INDEPENDENCE=ON \
60+
-DDBC_GENERATE_SINGLE_HEADER=ON
5761
5862
- name: Build tests + lib
5963
working-directory: ${{runner.workspace}}
@@ -129,11 +133,11 @@ jobs:
129133
CC: ${{matrix.cc}}
130134
CXX: ${{matrix.cxx}}
131135
run: |
132-
cmake -Bbuild -H$GITHUB_WORKSPACE \
136+
cmake -Bbuild -H$GITHUB_WORKSPACE \
133137
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
134-
-DCMAKE_CXX_STANDARD=${{matrix.std}} \
135-
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
136-
-DCMAKE_CXX_EXTENSIONS=ON \
138+
-DCMAKE_CXX_STANDARD=${{matrix.std}} \
139+
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
140+
-DCMAKE_CXX_EXTENSIONS=ON \
137141
-DDBC_TEST_LOCALE_INDEPENDENCE=ON
138142
139143
- name: Build tests + lib

scripts/fmt.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ FMT=""
1111

1212
# Some distros just call it clang-format. Others (e.g. Ubuntu) are insistent
1313
# that the version number be part of the command. We prefer clang-format if
14-
# that's present, otherwise we check clang-format-13
15-
for clangfmt in clang-format{,-13}; do
14+
# that's present, otherwise we check clang-format-16
15+
for clangfmt in clang-format{,-16}; do
1616
if which "$clangfmt" &>/dev/null; then
1717
FMT="$clangfmt"
1818
break
@@ -21,7 +21,7 @@ done
2121

2222
# Check if we found a working clang-format
2323
if [ -z "$FMT" ]; then
24-
echo "failed to find clang-format. Please install clang-format version 13 or above"
24+
echo "failed to find clang-format. Please install clang-format version 16 or above"
2525
exit 1
2626
fi
2727

0 commit comments

Comments
 (0)