Skip to content

Fix tidy-check when VCPKG is used #310

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

Open
Noorts wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix tidy-check when VCPKG is used #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 32 additions & 0 deletions .github/workflows/_extension_code_quality.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,21 @@ on:
type: string
required: false
default: "format;tidy"
# Override the default vcpkg repository
vcpkg_url:
required: false
type: string
default: "https://github.com/microsoft/vcpkg.git"
# Override the default vcpkg commit used by this version of DuckDB
vcpkg_commit:
required: false
type: string
default: "ce613c41372b23b1f51333815feb3edd87ef8a8b"
# Experimental option to allow automatically building the vcpkg dependencies of duckdb extensions that are used for testing
use_merged_vcpkg_manifest:
required: false
type: string
default: ""
secrets:
GH_TOKEN:
required: false
Expand Down Expand Up @@ -136,6 +151,23 @@ jobs:
shell: bash
run: sudo apt-get update -y -qq && sudo apt-get install -y -qq ninja-build clang-tidy && sudo pip3 install pybind11[global] --break-system-packages

- name: Setup vcpkg
shell: bash
run: |
mkdir local_vcpkg_installation
cmake --version
cd local_vcpkg_installation
git init
git remote add origin ${{ inputs.vcpkg_url }}
git fetch origin ${{ inputs.vcpkg_commit }}
git checkout ${{ inputs.vcpkg_commit }}
./bootstrap-vcpkg.sh
echo "VCPKG_ROOT=${{ github.workspace }}/local_vcpkg_installation" >> $GITHUB_ENV
echo "VCPKG_TOOLCHAIN_PATH=${{ github.workspace }}/local_vcpkg_installation/scripts/buildsystems/vcpkg.cmake" >> $GITHUB_ENV
echo "${{ github.workspace }}/local_vcpkg_installation" >> $GITHUB_PATH

- name: Tidy Check Diff
shell: bash
env:
USE_MERGED_VCPKG_MANIFEST: ${{ inputs.use_merged_vcpkg_manifest }}
run: make tidy-check
4 changes: 2 additions & 2 deletions makefiles/duckdb_extension.Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,9 @@ format-fix:
format-main:
python3 duckdb/scripts/format.py main --fix --noconfirm --directories src test

tidy-check:
tidy-check: ${EXTENSION_CONFIG_STEP}
mkdir -p ./build/tidy
cmake $(GENERATOR) $(BUILD_FLAGS) $(EXT_DEBUG_FLAGS) -DDISABLE_UNITY=1 -DCLANG_TIDY=1 -S $(DUCKDB_SRCDIR) -B build/tidy
cmake $(GENERATOR) $(BUILD_FLAGS) $(EXT_DEBUG_FLAGS) $(VCPKG_MANIFEST_FLAGS) -DDISABLE_UNITY=1 -DCLANG_TIDY=1 -S $(DUCKDB_SRCDIR) -B build/tidy
cp duckdb/.clang-tidy build/tidy/.clang-tidy
cd build/tidy && python3 ../../duckdb/scripts/run-clang-tidy.py '$(PROJ_DIR)src/.*/' -header-filter '$(PROJ_DIR)src/.*/' -quiet ${TIDY_THREAD_PARAMETER} ${TIDY_BINARY_PARAMETER} ${TIDY_PERFORM_CHECKS}

Expand Down