From b63cfdd50b24597cf97c3c3ecd7a4cc507ca4ffe Mon Sep 17 00:00:00 2001
From: tris203 <admin@snappeh.com>
Date: Sat, 16 Dec 2023 19:10:13 +0000
Subject: [PATCH 1/2] ci: fix ci

---
 .github/workflows/ci.yml   | 5 ++++-
 .github/workflows/lint.yml | 2 +-
 Makefile                   | 3 ++-
 scripts/tests/minimal.vim  | 3 +++
 4 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 scripts/tests/minimal.vim

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e23f0cf..16429d5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,9 +33,12 @@ jobs:
             mkdir -p _neovim
             curl -sL "https://github.com/neovim/neovim/releases/download/${{ matrix.rev }}" | tar xzf - --strip-components=1 -C "${PWD}/_neovim"
           }
+      - name: Dependencies
+        run: |
+            git clone --depth 1 https://github.com/nvim-lua/plenary.nvim ~/.local/share/nvim/site/pack/vendor/start/plenary.nvim
+            ln -s "$(pwd)" ~/.local/share/nvim/site/pack/vendor/start
       - name: Run tests
         run: |
           export PATH="${PWD}/_neovim/bin:${PATH}"
-          export VIM="${PWD}/_neovim/share/nvim/runtime"
           nvim --version
           make test
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 46759d5..7b2e3b7 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -11,7 +11,7 @@ jobs:
             - name: Setup
               run: |
                   sudo apt-get update
-                  sudo apt-get install luarocks
+                  sudo apt-get install luarocks -y
                   sudo luarocks install luacheck
 
             - name: Lint
diff --git a/Makefile b/Makefile
index a91af7a..702e97a 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ lint:
 
 test:
 	echo "===> Testing"
-	nvim --headless -c "PlenaryBustedDirectory lua/harpoon/test"
+	nvim --headless --noplugin -u scripts/tests/minimal.vim \
+        -c "PlenaryBustedDirectory lua/harpoon/test/ {minimal_init = 'scripts/tests/minimal.vim'}"
 
 pr-ready: fmt lint test
diff --git a/scripts/tests/minimal.vim b/scripts/tests/minimal.vim
new file mode 100644
index 0000000..7547e39
--- /dev/null
+++ b/scripts/tests/minimal.vim
@@ -0,0 +1,3 @@
+set rtp+=.
+set rtp+=../plenary.nvim
+runtime! plugin/plenary.vim

From 6442ebfe4d06840afb681eb7c6a460b6483f10c7 Mon Sep 17 00:00:00 2001
From: tris203 <admin@snappeh.com>
Date: Sat, 16 Dec 2023 20:41:34 +0000
Subject: [PATCH 2/2] ci: remove mac testing

---
 .github/workflows/ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 16429d5..92f918c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,10 +14,6 @@ jobs:
             rev: nightly/nvim-linux64.tar.gz
           - os: ubuntu-22.04
             rev: v0.9.0/nvim-linux64.tar.gz
-          - os: macos-12
-            rev: nightly/nvim-macos.tar.gz
-          - os: macos-12
-            rev: v0.9.0/nvim-macos.tar.gz
     steps:
       - uses: actions/checkout@v3
       - run: date +%F > todays-date