From 3b57ed40bd752518cabff6c18514c66a59629e4d Mon Sep 17 00:00:00 2001
From: Price Hiller <price@orion-technologies.io>
Date: Sun, 19 May 2024 06:48:28 -0500
Subject: [PATCH] Revert 14e1f22 'ci: use self-hosted runner'

---
 .github/workflows/ci.yml | 36 +++++++++++++++++++++++++++++++-----
 tests/minimal_init.lua   |  5 ++---
 tests/test.lua           |  4 ----
 3 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index efb8a6b..1fe6a74 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,13 +1,39 @@
 name: Tests
 
-on: [push, pull_request, workflow_call]
+on: [push, pull_request]
 
 jobs:
   x64-ubuntu:
-    name: nix-runner
-    runs-on: self-hosted
+    name: X64-ubuntu
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-24.04
+            url: https://github.com/neovim/neovim/releases/download/nightly/nvim-linux64.tar.gz
+            manager: sudo apt-get
+            packages: -y fd-find tree-sitter-cli
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
+      - run: date +%F > todays-date
+      - name: Restore cache for today's nightly.
+        uses: actions/cache@v3
+        with:
+          path: _neovim
+          key: ${{ runner.os }}-${{ matrix.url }}-${{ hashFiles('todays-date') }}
+
+      - name: Prepare
+        run: |
+          ${{ matrix.manager }} update
+          ${{ matrix.manager }} install ${{ matrix.packages }}
+          test -d _neovim || {
+            mkdir -p _neovim
+            curl -sL ${{ matrix.url }} | tar xzf - --strip-components=1 -C "${PWD}/_neovim"
+          }
 
       - name: Run tests
-        run: make test
+        run: |
+          export PATH="${PWD}/_neovim/bin:${PATH}"
+          export VIMRUNTIME="${PWD}/_neovim/share/nvim/runtime"
+          make test
diff --git a/tests/minimal_init.lua b/tests/minimal_init.lua
index 9e25550..15f0aab 100644
--- a/tests/minimal_init.lua
+++ b/tests/minimal_init.lua
@@ -1,8 +1,5 @@
 local M = {}
 
--- Ensure our test lua files are in `package.path`
-package.path = "?.lua;" .. package.path
-
 local utils = require("tests.utils.utils")
 local root = utils.paths.Root:push(".deps/")
 
@@ -140,5 +137,7 @@ end
 
 M.setup({
     ["plenary.nvim"] = "https://github.com/nvim-lua/plenary.nvim",
+    ["popup.nvim"] = "https://github.com/nvim-lua/popup.nvim",
     ["nvim-treesitter"] = "https://github.com/nvim-treesitter/nvim-treesitter",
+    ["playground"] = "https://github.com/nvim-treesitter/playground",
 })
diff --git a/tests/test.lua b/tests/test.lua
index 925189e..f7aebcf 100644
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -1,7 +1,3 @@
--- Ensure our test lua files are in `package.path`
-local fdir = vim.fn.fnamemodify(debug.getinfo(1, "S").source:sub(2), ":p:h:h")
-package.path = fdir .. "/?.lua;" .. package.path
-
 require("tests.minimal_init")
 
 ---@type string