diff options
| -rw-r--r-- | .github/workflows/ci.yml | 13 | ||||
| -rw-r--r-- | src/nvim/lua/executor.c | 3 | ||||
| -rw-r--r-- | test/functional/lua/vim_spec.lua | 4 |
3 files changed, 14 insertions, 6 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3565b20bfc..8c7e31e235 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,11 @@ concurrency: jobs: lint: + # This job tests two things: it lints the code but also builds neovim using + # system dependencies instead of bundled dependencies. This is to make sure + # we are able to build neovim without pigeonholing ourselves into specifics + # of the bundled dependencies. + if: (github.event_name == 'pull_request' && github.base_ref == 'master' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/master') runs-on: ubuntu-20.04 timeout-minutes: 10 @@ -100,7 +105,7 @@ jobs: - name: Cache dependencies run: ./ci/before_cache.sh - unixish: + posix: name: ${{ matrix.runner }} ${{ matrix.flavor }} (cc=${{ matrix.cc }}) strategy: fail-fast: false @@ -120,6 +125,12 @@ jobs: - cc: clang runner: macos-11.0 os: osx + + # The functionaltest-lua test two things simultaneously: + # 1. Check that the tests pass with PUC Lua instead of LuaJIT. + # 2. Use as oldest/minimum versions of dependencies/build tools we + # still explicitly support so we don't accidentally rely on + # features that is only available on later versions. - flavor: functionaltest-lua cc: gcc runner: ubuntu-20.04 diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c index 29a3c515c2..6aaff100ca 100644 --- a/src/nvim/lua/executor.c +++ b/src/nvim/lua/executor.c @@ -565,7 +565,8 @@ static bool nlua_init_packages(lua_State *lstate) lua_getglobal(lstate, "require"); lua_pushstring(lstate, "vim._init_packages"); if (nlua_pcall(lstate, 1, 0)) { - nlua_error(lstate, _("E5106: Error while loading packages: %.*s\n")); + mch_errmsg(lua_tostring(lstate, -1)); + mch_errmsg("\n"); return false; } diff --git a/test/functional/lua/vim_spec.lua b/test/functional/lua/vim_spec.lua index 3dacb7a114..e66e08d9d0 100644 --- a/test/functional/lua/vim_spec.lua +++ b/test/functional/lua/vim_spec.lua @@ -1,6 +1,5 @@ -- Test suite for testing interactions with API bindings local helpers = require('test.functional.helpers')(after_each) -local isCI = require('test.helpers').isCI local Screen = require('test.functional.ui.screen') local funcs = helpers.funcs @@ -2558,9 +2557,6 @@ describe('lua: builtin modules', function() it('does not work when disabled without runtime', function() - if isCI('sourcehut') then - pending('causes a core dump') - end clear{args={'--luamod-dev'}, env={VIMRUNTIME='fixtures/a'}} -- error checking could be better here. just check that --luamod-dev -- does anything at all by breaking with missing runtime.. |