Skip to content

Commit

Permalink
Revert 14e1f22 'ci: use self-hosted runner'
Browse files Browse the repository at this point in the history
  • Loading branch information
PriceHiller committed May 19, 2024
1 parent 4096aff commit 539e384
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 12 deletions.
36 changes: 31 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -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
5 changes: 2 additions & 3 deletions tests/minimal_init.lua
Original file line number Diff line number Diff line change
@@ -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/")

Expand Down Expand Up @@ -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",
})
4 changes: 0 additions & 4 deletions tests/test.lua
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 539e384

Please sign in to comment.