From 55ab76a1c0f63ebb735495a91066cbe01b6d0bb3 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sun, 27 Feb 2022 07:49:50 -0500 Subject: [PATCH 1/3] build: bump minimum version of luv to 1.43.0 This is required for the recent addition of lua loop threading (luv_set_thread). --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 08d52eb071..eae2d75e3f 100644 --- 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) From 8d8288461a58ff68e24b4273c3bbb58d2b0a316f Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sun, 27 Feb 2022 08:14:23 -0500 Subject: [PATCH 2/3] ci(lint): use bundled luv until system packages are updated --- .github/workflows/env.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/env.sh b/.github/workflows/env.sh index d424924c27..bd170f92fb 100755 --- 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 <> "$GITHUB_ENV" USE_BUNDLED=OFF CI_TARGET=lint From 97ed3efffffc6ab5e121130d712eed2e7c31d4d9 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sun, 27 Feb 2022 08:18:48 -0500 Subject: [PATCH 3/3] ci(lint): re-add building of third-party --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06a26dbb27..3565b20bfc 100644 --- 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