neovim

commit 243869658e2ecc35b25a37bab59c04eb45231924
parent 9d3370a14429587303d3abe6d4ece71342f5e4b5
Author: James McCoy <jamessan@jamessan.com>
Date:   Sun, 27 Feb 2022 09:16:50 -0500

Merge pull request #17540 from jamessan/luv-bump-fix

ci(lint): use bundled luv until system packages are updated
Diffstat:
M
.github/workflows/ci.yml
 | 
4
++++
M
.github/workflows/env.sh
 | 
4
+++-
M
CMakeLists.txt
 | 
2
+-

3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -67,9 +67,13 @@ jobs:
         uses: actions/cache@v2
         with:
           path: |
+            ${{ env.CACHE_NVIM_DEPS_DIR }}
             ~/.ccache
           key: lint-${{ hashFiles('cmake/*', '**/CMakeLists.txt', '!third-party/**CMakeLists.txt') }}-${{ github.base_ref }}
 
+      - name: Build third-party
+        run: ./ci/before_script.sh
+
       - name: Build nvim
         run: ./ci/run_tests.sh build
 
diff --git a/.github/workflows/env.sh b/.github/workflows/env.sh
@@ -46,7 +46,9 @@ CLANG_SANITIZER=TSAN
 EOF
     ;;
   lint)
-    BUILD_FLAGS="$BUILD_FLAGS -DLIBLUV_LIBRARY:FILEPATH=/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/lua/5.1/luv.so -DLIBLUV_INCLUDE_DIR:PATH=/usr/include/lua5.1"
+# Re-enable once system deps are available
+#    BUILD_FLAGS="$BUILD_FLAGS -DLIBLUV_LIBRARY:FILEPATH=/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/lua/5.1/luv.so -DLIBLUV_INCLUDE_DIR:PATH=/usr/include/lua5.1"
+    DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED_LUV=ON"
     cat <<EOF >> "$GITHUB_ENV"
 USE_BUNDLED=OFF
 CI_TARGET=lint
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -387,7 +387,7 @@ include_directories(SYSTEM ${LIBUV_INCLUDE_DIRS})
 find_package(Msgpack 1.0.0 REQUIRED)
 include_directories(SYSTEM ${MSGPACK_INCLUDE_DIRS})
 
-find_package(LibLUV 1.30.0 REQUIRED)
+find_package(LibLUV 1.43.0 REQUIRED)
 include_directories(SYSTEM ${LIBLUV_INCLUDE_DIRS})
 
 find_package(TreeSitter REQUIRED)