diff options
| author | AlexSm <[email protected]> | 2024-12-27 12:34:51 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-12-27 12:34:51 +0100 |
| commit | 9dcc8ccfb8df755decc42a74f045eb244f762a28 (patch) | |
| tree | 9a0865e9cf4351abea51c05ba8218ab996b13954 | |
| parent | c278ecf633c609140086acabff6088212792926f (diff) | |
Fix errors on removing files in sync_cmake (#13081)
| -rw-r--r-- | .github/workflows/sync_cmakebuild.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/sync_cmakebuild.yml b/.github/workflows/sync_cmakebuild.yml index 3601dfab906..b6f0220f914 100644 --- a/.github/workflows/sync_cmakebuild.yml +++ b/.github/workflows/sync_cmakebuild.yml @@ -42,7 +42,7 @@ jobs: git clean -fd > /dev/null if [ -s $conflicts_file ];then echo "Conflicts detected, trying to remove referenced CMakeLists* files" - grep -E -o '\s\S*CMakeLists\S*\s' $conflicts_file | xargs rm + grep -E -o '\s\S*CMakeLists\S*\s' $conflicts_file | xargs rm -f git add . git commit -m "Remove conflicted CMakeLists" else |