ci: fix lintc to use external dependencies instead of bundled (#21995)

Use the bundled libvterm dependency as the external package is outdated,
with the hopes of being able to use the external package once its
version meets our required version.

Co-authored-by: Christian Clason <c.clason@uni-graz.at>
This commit is contained in:
dundargoc 2023-01-25 20:33:18 +01:00 committed by GitHub
parent 3c48d3c83f
commit 15394b6855
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions

View File

@ -128,7 +128,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Setup common environment variables - name: Setup common environment variables
run: ./.github/workflows/env.sh lint run: ./.github/workflows/env.sh lintc
- name: Install apt packages - name: Install apt packages
run: | run: |
@ -141,14 +141,17 @@ jobs:
libtree-sitter-dev \ libtree-sitter-dev \
libunibilium-dev \ libunibilium-dev \
libuv1-dev \ libuv1-dev \
libvterm-dev \
lua-busted \ lua-busted \
lua-filesystem \ lua-filesystem \
lua-inspect \ lua-inspect \
lua-lpeg \ lua-lpeg \
lua-luv-dev \
lua-nvim \ lua-nvim \
luajit luajit
# libvterm-dev \
# lua-luv-dev
# Remove comments from packages once we start using these external
# dependencies. See env.sh for more context.
- uses: ./.github/actions/cache - uses: ./.github/actions/cache
@ -156,7 +159,7 @@ jobs:
run: ./ci/before_script.sh run: ./ci/before_script.sh
- name: Build nvim - name: Build nvim
run: ./ci/run_tests.sh build_nvim run: make
- if: "!cancelled()" - if: "!cancelled()"
name: Determine if run should be aborted name: Determine if run should be aborted

View File

@ -44,13 +44,15 @@ EOF
BUILD_UCHAR=1 BUILD_UCHAR=1
EOF EOF
;; ;;
lint) lintc)
# Re-enable once system deps are available # 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" # 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" # Ideally all dependencies should external for this job, but some
USE_BUNDLED=OFF # dependencies don't have the required version available. We use the
EOF # bundled versions for these with the hopes of being able to remove them
# later on.
DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED=OFF -DUSE_BUNDLED_LUV=ON -DUSE_BUNDLED_LIBVTERM=ON"
;; ;;
functionaltest-lua) functionaltest-lua)
BUILD_FLAGS="$BUILD_FLAGS -DPREFER_LUA=ON" BUILD_FLAGS="$BUILD_FLAGS -DPREFER_LUA=ON"