Skip to content

Commit

Permalink
ci: don't use bundled gperf for nvim0.7, does not seem to compile.
Browse files Browse the repository at this point in the history
  • Loading branch information
L3MON4D3 committed Sep 17, 2023
1 parent ea7d7ea commit cdffd08
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
ref: ${{ github.head_ref }}
# only install required dependencies, make build uses bundled libraries, etc.
# from here: https://github.com/neovim/neovim/blob/3a5dddf24f9d4d8959194b0cd3c6a7dd0cbd73ae/.github/scripts/install_deps_ubuntu.sh
# gperf is needed for neovim 0.7, the bundled version does not seem to build.
- run: |
sudo add-apt-repository ppa:neovim-ppa/stable
sudo apt-get update
Expand All @@ -27,7 +28,8 @@ jobs:
locales-all \
ninja-build \
pkg-config \
unzip
unzip \
gperf
# install luajit+headers for jsregexp
sudo apt-get install -y libluajit-5.1-dev luajit
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,5 @@ test: nvim jsregexp
export TEST_FILE=$(realpath ${TEST_FILE}); \
export BUSTED_ARGS=--lpath=$(shell pwd)/tests/?.lua; \
set -e; \
if ${TEST_07}; then make -C ${NVIM_0.7_PATH} functionaltest; fi; \
if ${TEST_07}; then make -C ${NVIM_0.7_PATH} functionaltest DEPS_CMAKE_FLAGS=-DUSE_BUNDLED_GPERF=OFF; fi; \
if ${TEST_MASTER}; then make -C ${NVIM_MASTER_PATH} functionaltest; fi;

0 comments on commit cdffd08

Please sign in to comment.