mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-18 13:59:01 -05:00
Merge topic 'typos-1.36.1'
8fb6449275ci: Update to typos 1.36.1 in Fedora base image49e05f9569pre-commit: bump to typos 1.36.120e19a713dSource: Fix typo discovered by typos 1.36.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !11150
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
set -e
|
||||
|
||||
typos_version=1.29.4
|
||||
typos_version=1.36.1
|
||||
cargo install --root /usr/local --version "$typos_version" typos-cli
|
||||
|
||||
strip /usr/local/bin/typos
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
### Fedora
|
||||
|
||||
.fedora42:
|
||||
image: "kitware/cmake:ci-fedora42-x86_64-2025-09-01"
|
||||
image: "kitware/cmake:ci-fedora42-x86_64-2025-09-08"
|
||||
|
||||
variables:
|
||||
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"
|
||||
|
||||
@@ -29,7 +29,7 @@ repos:
|
||||
- id: check-useless-excludes
|
||||
|
||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||
rev: v5.0.0
|
||||
rev: v6.0.0
|
||||
hooks:
|
||||
- id: check-case-conflict
|
||||
- id: check-json
|
||||
@@ -110,7 +110,7 @@ repos:
|
||||
|
||||
# NOTE See BUG https://github.com/crate-ci/typos/issues/390
|
||||
- repo: https://github.com/adhtruong/mirrors-typos
|
||||
rev: v1.33.1
|
||||
rev: v1.36.1
|
||||
hooks:
|
||||
- id: typos
|
||||
# NOTE Override hook's default args to prevent automatic
|
||||
|
||||
@@ -4240,7 +4240,7 @@ std::string cmLocalGenerator::GetObjectFileNameWithoutTarget(
|
||||
}
|
||||
|
||||
// This can return an absolute path in the case where source is
|
||||
// not relative to the current source or binary directoreis
|
||||
// not relative to the current source or binary directories
|
||||
std::string objectName = this->GetRelativeSourceFileName(source);
|
||||
// if it is still a full path check for the try compile case
|
||||
// try compile never have in source sources, and should not
|
||||
|
||||
Reference in New Issue
Block a user