Skip to content

Commit 039fff1

Browse files
0x501DDifferentialOrange
authored andcommitted
ci: remove tarantoolctl
Part of tarantool/tarantool#9443
1 parent 5378b93 commit 039fff1

File tree

4 files changed

+24
-12
lines changed

4 files changed

+24
-12
lines changed

.github/workflows/check_on_push.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,16 @@ jobs:
1818
with:
1919
tarantool-version: '2.10'
2020

21+
- name: Setup tt
22+
run: |
23+
curl -L https://tarantool.io/release/2/installer.sh | sudo bash
24+
sudo apt install -y tt
25+
tt version
26+
2127
- name: Setup luacheck
22-
run: tarantoolctl rocks install luacheck 0.25.0
28+
run: |
29+
tt init
30+
tt rocks install luacheck 0.25.0
2331
2432
- run: cmake -S . -B build
2533

.github/workflows/reusable_test.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,19 @@ jobs:
3131
sudo dpkg -i tarantool_*.deb tarantool-common_*.deb tarantool-dev_*.deb
3232
tarantool --version
3333
34+
- name: Setup tt
35+
run: |
36+
curl -L https://tarantool.io/release/2/installer.sh | sudo bash
37+
sudo apt install -y tt
38+
tt version
39+
3440
- name: Install requirements
3541
run: ./deps.sh
3642

3743
- name: Install metrics
38-
run: tarantoolctl rocks install metrics 1.0.0
44+
run: |
45+
tt init
46+
tt rocks install metrics 1.0.0
3947
4048
# This server starts and listen on 8084 port that is used for tests
4149
- name: Stop Mono server

.github/workflows/test_on_push.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,9 @@ jobs:
237237
matrix:
238238
tarantool-version:
239239
- folder: "1.10"
240-
bundle: "tarantool-enterprise-sdk-1.10.15-0-r563"
240+
bundle: "tarantool-enterprise-sdk-1.10.15-0-r609"
241241
- folder: "2.11"
242-
bundle: "tarantool-enterprise-sdk-nogc64-2.11.0-0-r563.linux.x86_64"
242+
bundle: "tarantool-enterprise-sdk-nogc64-2.11.2-0-r609.linux.x86_64"
243243
metrics-version: ["", "1.0.0"]
244244
cartridge-version: ["2.8.0"]
245245
include:
@@ -259,7 +259,6 @@ jobs:
259259
tar -xzf ${{ matrix.tarantool-version.bundle }}.tar.gz
260260
rm -f ${{ matrix.tarantool-version.bundle }}.tar.gz
261261
sudo cp tarantool-enterprise/tarantool /usr/bin/tarantool
262-
sudo rm tarantool-enterprise/tt
263262
source tarantool-enterprise/env.sh
264263
tarantool --version
265264
./deps.sh
@@ -271,7 +270,8 @@ jobs:
271270
if: matrix.metrics-version != ''
272271
run: |
273272
source tarantool-enterprise/env.sh
274-
tarantoolctl rocks install metrics ${{ matrix.metrics-version }}
273+
tt init
274+
tt rocks install metrics ${{ matrix.metrics-version }}
275275
276276
# This server starts and listen on 8084 port that is used for tests
277277
- name: Stop Mono server

deps.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@ set -e
66
TTCTL=tt
77
if ! [ -x "$(command -v tt)" ];
88
then
9-
if ! [ -x "$(command -v tarantoolctl)" ];
10-
then
11-
echo "tt or tarantoolctl not found"
12-
exit 1
13-
fi
14-
TTCTL=tarantoolctl
9+
echo "tt not found"
10+
exit 1
1511
fi
1612

1713
# Test dependencies:

0 commit comments

Comments
 (0)