diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1fe6a74..efb8a6b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,39 +1,13 @@ name: Tests -on: [push, pull_request] +on: [push, pull_request, workflow_call] jobs: x64-ubuntu: - 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 + name: nix-runner + runs-on: self-hosted steps: - - 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" - } + - uses: actions/checkout@v4 - name: Run tests - run: | - export PATH="${PWD}/_neovim/bin:${PATH}" - export VIMRUNTIME="${PWD}/_neovim/share/nvim/runtime" - make test + run: make test diff --git a/tests/test.lua b/tests/test.lua index f7aebcf..57e74d0 100644 --- a/tests/test.lua +++ b/tests/test.lua @@ -1,3 +1,11 @@ +-- Ensure our test lua files are in `package.path` +local fdir = vim.fn.fnamemodify(debug.getinfo(1, "S").source:sub(2), ":p:h") +package.path = vim.fn.fnamemodify(fdir, ":h") .. "/?.lua;" .. package.path +for _, test_dir in ipairs(vim.fn.globpath(fdir, "**/", false, 1)) do + package.path = test_dir .. "?.lua;" .. package.path +end +vim.print(package.path) + require("tests.minimal_init") ---@type string