Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update tests for latest kitty and update nvim backports #276

Merged
merged 2 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- 'stable' # v0.10.0
- 'nightly'
kitty_version:
- 'stable' # 0.36.+
- 'stable' # 0.37.+
- 'nightly'
# update __branch-protection-rules.json and run __update_branch_protection_rules.sh when modified
# test all version of nvim released as of v0.9.0
Expand All @@ -56,6 +56,8 @@ jobs:
kitty_version: '0.34.1'
- nvim_version: 'stable'
kitty_version: '0.35.2'
- nvim_version: 'stable'
kitty_version: '0.36.4'
fail-fast: false
runs-on: ubuntu-22.04
steps:
Expand Down
5 changes: 3 additions & 2 deletions lua/kitty-scrollback/backport/backport-sha.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"runtime/lua/vim/_system.lua": "691140fdecfa0c3dd28bd68505a47941c26fdf7efb9bfcd72d338e0cb59fe466",
"runtime/lua/vim/version.lua": "6d5b925c8af9ad769c6a19e89319a8ad12def13a4184135f490a3b0cb0add4ef"
"runtime/lua/vim/_editor.lua": "800e0cca6acc3f53563ceee152e3237cc2be5de915ef40f7f0302daa992d4b17",
"runtime/lua/vim/_system.lua": "acf6253586bbe9f08acbb4845260c8d704f8c4e432df3510b92e9fb987eacb6f",
"runtime/lua/vim/version.lua": "681dafb4dad3ca135047112b5c744f1c54759eea4676a94c55cbe0ffce0eb930"
}
7 changes: 4 additions & 3 deletions lua/kitty-scrollback/backport/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local M = {}
local function backport_version()
if type(vim.version().__tostring) ~= 'function' then
-- NOTE: copied __tostring from
-- https://github.com/neovim/neovim/blob/0d3f2c4904d552635da07a6e2b4e75520b514940/runtime/lua/vim/version.lua#L125
-- https://github.com/neovim/neovim/blob/1d4ba8c1edba064421b34c1197c3470a09798218/runtime/lua/vim/version.lua#L125

local Version = {}
function Version:__tostring()
Expand All @@ -27,7 +27,7 @@ local function backport_version()
end

-- NOTE: copied setmetatable from
-- https://github.com/neovim/neovim/blob/0d3f2c4904d552635da07a6e2b4e75520b514940/runtime/lua/vim/version.lua#L455
-- https://github.com/neovim/neovim/blob/1d4ba8c1edba064421b34c1197c3470a09798218/runtime/lua/vim/version.lua#L463
setmetatable(vim.version, {
--- Returns the current Nvim version.
---@return vim.Version
Expand Down Expand Up @@ -56,7 +56,8 @@ local function backport_uv()
end

local function backport_system()
-- copied from _editor.lua
-- NOTE: copied vim.system from
-- https://github.com/neovim/neovim/blob/1d4ba8c1edba064421b34c1197c3470a09798218/runtime/lua/vim/_editor.lua#L143
---@diagnostic disable-next-line: duplicate-set-field
vim.system = function(cmd, opts, on_exit)
if type(opts) == 'function' then
Expand Down
3 changes: 2 additions & 1 deletion scripts/internal/__branch-protection-rules.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"plenary (stable, 0.32.2)",
"plenary (stable, 0.33.1)",
"plenary (stable, 0.34.1)",
"plenary (stable, 0.35.2)"
"plenary (stable, 0.35.2)",
"plenary (stable, 0.36.4)"
]
},
"enforce_admins": false,
Expand Down
Loading