Skip to content

Commit

Permalink
format: don't bazelbuild fix; compilation db: choose first bant.
Browse files Browse the repository at this point in the history
  • Loading branch information
hzeller committed Jan 12, 2025
1 parent 41bf394 commit 2826433
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/bin/make-compilation-db.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if [ "${BANT}" = "needs-to-be-compiled-locally" ]; then
# the full realpath of the resulting binary to be immune to symbolic-link
# switcharoo by bazel.
${BAZEL} build -c opt --cxxopt=-std=c++20 @bant//bant:bant >/dev/null 2>&1
BANT=$(realpath bazel-bin/external/bant*/bant/bant)
BANT=$(realpath bazel-bin/external/bant*/bant/bant | head -1)
fi

BAZEL_OPTS="-c opt --noshow_progress"
Expand Down
3 changes: 2 additions & 1 deletion .github/bin/run-format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ find . -name "*.h" -o -name "*.cc" \
# If we have buildifier installed, use that to format BUILD files
if command -v ${BUILDIFIER} >/dev/null; then
echo "Run $(buildifier --version)"
${BUILDIFIER} -lint=fix MODULE.bazel $(find . -name BUILD -o -name "*.bzl")
# TODO(hzeller): re-enable -lint=fix once compatible bazel version range again
${BUILDIFIER} MODULE.bazel $(find . -name BUILD -o -name "*.bzl")
fi

# Check if we got any diff
Expand Down

0 comments on commit 2826433

Please sign in to comment.