Skip to content

Commit 29bc004

Browse files
authored
Merge pull request #78 from sir-gon/develop
[CONFIG] [Github Actions] clang-format (code styling check) set to cl…
2 parents 7469980 + 4241efc commit 29bc004

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

.github/workflows/clang-format.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
32
name: clang-format style check
43

54
on: # yamllint disable-line rule:truthy
@@ -25,7 +24,9 @@ jobs:
2524
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
2625
sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main"
2726
sudo apt-get -y update
28-
sudo apt-get -y install --no-install-recommends --no-install-suggests clang-format
27+
sudo apt-get -y install --no-install-recommends --no-install-suggests clang-format-19
28+
sudo update-alternatives --install /usr/bin/clang-format clang-format $(which clang-format-19) 100
29+
sudo update-alternatives --set clang-format $(update-alternatives --list clang-format | grep clang-format-19)
2930
# yamllint enable rule:line-length
3031
3132
- name: Check Tools

.github/workflows/cpp-macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ jobs:
2424
- name: Install
2525
shell: bash
2626
run: |
27-
export VCPKG_VERSION=2025.01.13
28-
brew install vcpkg
27+
export VCPKG_VERSION=2025.02.14
2928
git clone \
3029
--depth 1 \
3130
--branch $VCPKG_VERSION \
3231
https://github.com/microsoft/vcpkg.git \
3332
--single-branch \
3433
"$HOME/vcpkg"
3534
export VCPKG_ROOT="$HOME/vcpkg"
35+
echo "$VCPKG_ROOT" >> $GITHUB_PATH
3636
sh $VCPKG_ROOT/bootstrap-vcpkg.sh
3737
echo "VCPKG_ROOT=$HOME/vcpkg" >> $GITHUB_ENV
3838

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ COVERAGE_TOOL_OPTS=--config-file .lcovrc --ignore-errors empty --ignore-errors i
2828

2929
# C++ specific
3030
SRC_DIR = src
31-
FILES := $(shell find $(SRC_DIR) -name '*.cpp' -o -name '*.h' -o -name '*.hpp' -o -name '*.inl')
31+
FILES := $(shell find $(SRC_DIR) -name '*.cpp' -o -name '*.c' -o -name '*.h' -o -name '*.hpp' -o -name '*.inl')
3232

3333
.MAIN: test
3434
.PHONY: all clean dependencies help list test outdated
@@ -142,7 +142,9 @@ compose/test: compose/build
142142
compose/run: compose/build
143143
${DOCKER_COMPOSE} --profile production run --rm algorithm-exercises-cpp ls -alhR
144144

145-
all: env dependencies test
145+
compose/all: compose/rebuild compose/test compose/lint
146+
147+
all: env dependencies test lint
146148

147149
run:
148150
ls -alh

0 commit comments

Comments
 (0)