diff options
| author | James McCoy <jamessan@jamessan.com> | 2022-02-27 09:16:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-27 09:16:50 -0500 |
| commit | 243869658e2ecc35b25a37bab59c04eb45231924 (patch) | |
| tree | 4c8fa863ffd5d97f601410c65e5900f654fbc50b | |
| parent | 9d3370a14429587303d3abe6d4ece71342f5e4b5 (diff) | |
| parent | 97ed3efffffc6ab5e121130d712eed2e7c31d4d9 (diff) | |
| download | rneovim-243869658e2ecc35b25a37bab59c04eb45231924.tar.gz rneovim-243869658e2ecc35b25a37bab59c04eb45231924.tar.bz2 rneovim-243869658e2ecc35b25a37bab59c04eb45231924.zip | |
Merge pull request #17540 from jamessan/luv-bump-fix
ci(lint): use bundled luv until system packages are updated
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rwxr-xr-x | .github/workflows/env.sh | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 |
3 files changed, 8 insertions, 2 deletions
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 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 <<EOF >> "$GITHUB_ENV" USE_BUNDLED=OFF CI_TARGET=lint 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) |