diff options
| -rw-r--r-- | .github/workflows/test.yml | 2 | ||||
| -rw-r--r-- | cmake.deps/CMakeLists.txt | 5 | ||||
| -rwxr-xr-x | src/nvim/CMakeLists.txt | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 93bf5c4d79..5f8e445f36 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -354,7 +354,7 @@ jobs: with: update: true pacboy: >- - make:p gcc:p + make:p gcc:p diffutils:p release: false - if: success() || failure() && steps.abort_job.outputs.status == 'success' diff --git a/cmake.deps/CMakeLists.txt b/cmake.deps/CMakeLists.txt index 3cbbbf2712..e6852e6265 100644 --- a/cmake.deps/CMakeLists.txt +++ b/cmake.deps/CMakeLists.txt @@ -164,11 +164,9 @@ set(LUV_SHA256 222b38b6425f0926218e14e7da81481fdde6f9660c1feac25a53e6fb52e886e6) set(LUA_COMPAT53_URL https://github.com/keplerproject/lua-compat-5.3/archive/v0.9.tar.gz) set(LUA_COMPAT53_SHA256 ad05540d2d96a48725bb79a1def35cf6652a4e2ec26376e2617c8ce2baa6f416) -# Windows only: cat.exe diff.exe tee.exe xxd.exe +# Windows only: cat.exe tee.exe xxd.exe set(CAT_URL https://github.com/neovim/deps/raw/21c5e8bdda33521a6ed497b315e03265a2785cbc/opt/cat.exe) set(CAT_SHA256 93b8d307bb15af3968920bdea3beb869a49d166f9164853c58a4e6ffdcae61c6) -set(DIFF_URL https://github.com/neovim/deps/raw/21c5e8bdda33521a6ed497b315e03265a2785cbc/opt/diff.exe) -set(DIFF_SHA256 4ceceebc8150422c6d8d9a06c2e9686d5a5d90f1033f60ad92ab81fe810e2a28) set(TEE_URL https://github.com/neovim/deps/raw/21c5e8bdda33521a6ed497b315e03265a2785cbc/opt/tee.exe) set(TEE_SHA256 950eea4e17fa3a7e89fa2c55374037b5797b3f1a54fea1304634884ab42ec14d) set(XXD_URL https://github.com/neovim/deps/raw/21c5e8bdda33521a6ed497b315e03265a2785cbc/opt/xxd.exe) @@ -267,7 +265,6 @@ if(WIN32) include(GetBinaryDeps) GetExecutable(TARGET cat) - GetExecutable(TARGET diff) GetExecutable(TARGET tee) GetExecutable(TARGET xxd) diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index bfdbe0c3b5..28ba4e2ed3 100755 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -762,7 +762,6 @@ if(WIN32) "file(MAKE_DIRECTORY \"${PROJECT_BINARY_DIR}/windows_runtime_deps/platforms\")") foreach(DEP_FILE IN ITEMS cat.exe - diff.exe tee.exe win32yank.exe xxd.exe |