Skip to content

ci: add tarantool 2.10 into CI #26

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Oct 4, 2022
Merged

ci: add tarantool 2.10 into CI #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
871ba45
test: adjust tarantool version parsing for 2.10.0+
Totktonada Oct 3, 2022
171002d
ci: add tarantool 2.10 into CI
Totktonada Oct 3, 2022
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
1 change: 1 addition & 0 deletions .github/workflows/fast_testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
- '2.6'
- '2.7'
- '2.8'
- '2.10'

runs-on: ubuntu-latest
steps:
Expand Down
13 changes: 5 additions & 8 deletions test/tuple_keydef.test.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@ local function parse_tarantool_version(component)
-- version, on which it is based, in the first four components
-- (as well as in the commit hash).
--
-- So we ignore everything after 4th component.
local pattern = '^(%d+).(%d+).(%d+)-(%d+)-g[0-9a-f]+'
-- We don't use version components behind the first three
-- ones in the testing code for simplicity. We also ignore
-- alpha/beta/rc suffixes for the same reason.
local pattern = '^(%d+)%.(%d+)%.(%d+)'
return tonumber((select(component, _TARANTOOL:match(pattern))))
end

local _TARANTOOL_MAJOR = parse_tarantool_version(1)
local _TARANTOOL_MINOR = parse_tarantool_version(2)
local _TARANTOOL_PATCH = parse_tarantool_version(3)
local _TARANTOOL_REV = parse_tarantool_version(4)

local function tarantool_version_at_least(major, minor, patch, rev)
local function tarantool_version_at_least(major, minor, patch)
local major = major or 0
local minor = minor or 0
local patch = patch or 0
local rev = rev or 0

if _TARANTOOL_MAJOR < major then return false end
if _TARANTOOL_MAJOR > major then return true end
Expand All @@ -37,9 +37,6 @@ local function tarantool_version_at_least(major, minor, patch, rev)
if _TARANTOOL_PATCH < patch then return false end
if _TARANTOOL_PATCH > patch then return true end

if _TARANTOOL_REV < rev then return false end
if _TARANTOOL_REV > rev then return true end

return true
end

Expand Down