Skip to content

Commit ce9a2c7

Browse files
ci: bump ubuntu version
Bump actions to use ubuntu-24.04 for fixing the following GitHub warning: The Ubuntu 20.04 Actions runner image will begin deprecation on 2025-02-01. Update list of `tarantool` versions to test. Part of #TNTP-1918
1 parent 1af584e commit ce9a2c7

File tree

7 files changed

+39
-33
lines changed

7 files changed

+39
-33
lines changed

.github/workflows/publish.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
version-check:
1010
# We need this job to run only on push with tag.
1111
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-24.04
1313
steps:
1414
- name: Check module version
1515
uses: tarantool/actions/check-module-version@master
@@ -18,7 +18,7 @@ jobs:
1818

1919
publish-scm-1:
2020
if: github.ref == 'refs/heads/master'
21-
runs-on: ubuntu-20.04
21+
runs-on: ubuntu-24.04
2222
steps:
2323
- uses: actions/checkout@v4
2424
- uses: tarantool/rocks.tarantool.org/github-action@master
@@ -29,15 +29,15 @@ jobs:
2929
publish-tag:
3030
if: startsWith(github.ref, 'refs/tags/')
3131
needs: version-check
32-
runs-on: ubuntu-20.04
32+
runs-on: ubuntu-24.04
3333
steps:
3434
- uses: actions/checkout@v4
35-
- uses: tarantool/setup-tarantool@v2
35+
- uses: tarantool/setup-tarantool@v3
3636
with:
3737
tarantool-version: '2.11'
3838

3939
- name: Prepare apt repo
40-
run: curl -L https://tarantool.io/release/2/installer.sh | bash
40+
run: curl -L https://tarantool.io/release/3/installer.sh | bash
4141

4242
- name: Install tt cli
4343
run: sudo apt install -y tt

.github/workflows/reusable_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
jobs:
1313
run_tests:
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-24.04
1515

1616
steps:
1717
- name: Clone the ddl module
@@ -33,7 +33,7 @@ jobs:
3333
3434
- name: Setup tt
3535
run: |
36-
curl -L https://tarantool.io/release/2/installer.sh | sudo bash
36+
curl -L https://tarantool.io/release/3/installer.sh | sudo bash
3737
sudo apt install -y tt
3838
tt version
3939

.github/workflows/test.yml

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,13 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
tarantool: ['1.10', '2.5', '2.6', '2.7', '2.8', '2.10']
13-
coveralls: [false]
14-
include:
15-
- tarantool: '2.11'
16-
coveralls: true
17-
# There are problems with current version of the
18-
# setup-tarantool action on Ubuntu Jammy (ubuntu-latest or
19-
# ubuntu-22.04). Use Ubuntu Focal (ubuntu-20.04) until they
20-
# will be resolved. See [1] for details.
21-
#
22-
# [1]: https://github.com/tarantool/setup-tarantool/issues/36
23-
runs-on: [ubuntu-20.04]
12+
tarantool: ['2.11', '3.3']
13+
14+
runs-on: [ubuntu-24.04]
2415
steps:
2516
- uses: actions/checkout@v4
2617

27-
- uses: tarantool/setup-tarantool@v2
18+
- uses: tarantool/setup-tarantool@v3
2819
with:
2920
tarantool-version: ${{ matrix.tarantool }}
3021

@@ -38,7 +29,7 @@ jobs:
3829

3930
# Setup luatest and luacheck
4031
- name: Cache rocks
41-
uses: actions/cache@v3
32+
uses: actions/cache@v4
4233
id: cache-rocks
4334
with:
4435
path: .rocks/
@@ -66,10 +57,11 @@ jobs:
6657

6758
- name: Run tests and code coverage analysis
6859
run: make -C build coverage
60+
if: ${{ startsWith(matrix.tarantool, '2.') }}
6961

7062
- name: Send code coverage to coveralls.io
7163
run: make -C build coveralls
72-
if: ${{ matrix.coveralls }}
64+
if: ${{ startsWith(matrix.tarantool, '2.') }}
7365

7466
# Cleanup cached paths
7567
- run: tt rocks remove cartridge
@@ -78,18 +70,13 @@ jobs:
7870
strategy:
7971
fail-fast: false
8072
matrix:
81-
tarantool: ['2.11']
82-
# There are problems with current version of the
83-
# setup-tarantool action on Ubuntu Jammy (ubuntu-latest or
84-
# ubuntu-22.04). Use Ubuntu Focal (ubuntu-20.04) until they
85-
# will be resolved. See [1] for details.
86-
#
87-
# [1]: https://github.com/tarantool/setup-tarantool/issues/36
88-
runs-on: [ubuntu-20.04]
73+
tarantool: ['2.11', '3.3']
74+
75+
runs-on: [ubuntu-24.04]
8976
steps:
9077
- uses: actions/checkout@v4
9178

92-
- uses: tarantool/setup-tarantool@v2
79+
- uses: tarantool/setup-tarantool@v3
9380
with:
9481
tarantool-version: ${{ matrix.tarantool }}
9582

@@ -103,7 +90,7 @@ jobs:
10390

10491
# Setup luatest
10592
- name: Cache rocks
106-
uses: actions/cache@v3
93+
uses: actions/cache@v4
10794
id: cache-rocks
10895
with:
10996
path: .rocks/

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.10...3.31 FATAL_ERROR)
22

33
project(ddl C)
44

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,5 +349,6 @@ tt rocks make
349349
```bash
350350
tt rocks install luatest 0.5.7
351351
tt rocks install luacheck 0.25.0
352+
tt rocks install cartridge
352353
make test -C build.luarocks ARGS="-V"
353354
```

test/role_test.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ local g = t.group()
44
local fio = require('fio')
55
local yaml = require('yaml')
66
local helpers = require('test.helper')
7+
local tarantool_helpers = require('test.tarantool_helpers')
78

89
g.before_all(function()
10+
tarantool_helpers.skip_if_tarantool3()
11+
912
t.skip_if(
1013
not pcall(require, 'cartridge'),
1114
'cartridge not installed'

test/tarantool_helpers.lua

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
local luatest = require('luatest')
2+
local luatest_utils = require('luatest.utils')
3+
4+
local tarantool_helpers = {}
5+
6+
tarantool_helpers.is_tarantool3 = function()
7+
local tarantool_version = luatest_utils.get_tarantool_version()
8+
return luatest_utils.version_ge(tarantool_version, luatest_utils.version(3, 0, 0))
9+
end
10+
11+
tarantool_helpers.skip_if_tarantool3 = function()
12+
luatest.skip_if(tarantool_helpers.is_tarantool3(), 'Tarantool 3 is not supported')
13+
end
14+
15+
return tarantool_helpers

0 commit comments

Comments
 (0)