From cdffd08a366ea4f4cd50cefe7db31f0615381cce Mon Sep 17 00:00:00 2001
From: L3MON4D3 <Simljk@outlook.de>
Date: Sun, 17 Sep 2023 08:54:49 +0200
Subject: [PATCH] ci: don't use bundled gperf for nvim0.7, does not seem to
 compile.

---
 .github/workflows/test.yaml | 4 +++-
 Makefile                    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 6a23b9c47..562ff99e9 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -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
@@ -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
diff --git a/Makefile b/Makefile
index 8ea4b86b0..3c8f8da33 100644
--- a/Makefile
+++ b/Makefile
@@ -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;