diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index e5a4ae3..60c87cb 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -1,5 +1,4 @@ --- - name: clang-format style check on: # yamllint disable-line rule:truthy @@ -25,7 +24,9 @@ jobs: wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main" sudo apt-get -y update - sudo apt-get -y install --no-install-recommends --no-install-suggests clang-format + sudo apt-get -y install --no-install-recommends --no-install-suggests clang-format-19 + sudo update-alternatives --install /usr/bin/clang-format clang-format $(which clang-format-19) 100 + sudo update-alternatives --set clang-format $(update-alternatives --list clang-format | grep clang-format-19) # yamllint enable rule:line-length - name: Check Tools diff --git a/.github/workflows/cpp-macos.yml b/.github/workflows/cpp-macos.yml index 37b6e35..f864187 100644 --- a/.github/workflows/cpp-macos.yml +++ b/.github/workflows/cpp-macos.yml @@ -24,8 +24,7 @@ jobs: - name: Install shell: bash run: | - export VCPKG_VERSION=2025.01.13 - brew install vcpkg + export VCPKG_VERSION=2025.02.14 git clone \ --depth 1 \ --branch $VCPKG_VERSION \ @@ -33,6 +32,7 @@ jobs: --single-branch \ "$HOME/vcpkg" export VCPKG_ROOT="$HOME/vcpkg" + echo "$VCPKG_ROOT" >> $GITHUB_PATH sh $VCPKG_ROOT/bootstrap-vcpkg.sh echo "VCPKG_ROOT=$HOME/vcpkg" >> $GITHUB_ENV diff --git a/Makefile b/Makefile index f0c3529..7cb855f 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ COVERAGE_TOOL_OPTS=--config-file .lcovrc --ignore-errors empty --ignore-errors i # C++ specific SRC_DIR = src -FILES := $(shell find $(SRC_DIR) -name '*.cpp' -o -name '*.h' -o -name '*.hpp' -o -name '*.inl') +FILES := $(shell find $(SRC_DIR) -name '*.cpp' -o -name '*.c' -o -name '*.h' -o -name '*.hpp' -o -name '*.inl') .MAIN: test .PHONY: all clean dependencies help list test outdated @@ -142,7 +142,9 @@ compose/test: compose/build compose/run: compose/build ${DOCKER_COMPOSE} --profile production run --rm algorithm-exercises-cpp ls -alhR -all: env dependencies test +compose/all: compose/rebuild compose/test compose/lint + +all: env dependencies test lint run: ls -alh