Skip to content

Commit 7ce2784

Browse files
0x501Doleg-jukovec
authored andcommitted
ci: remove tarantoolctl
Part of tarantool/tarantool#9443
1 parent 02a8820 commit 7ce2784

File tree

4 files changed

+23
-8
lines changed

4 files changed

+23
-8
lines changed

.github/workflows/check.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,14 @@ jobs:
1919
with:
2020
tarantool-version: '2.8'
2121

22+
- name: Setup tt
23+
run: |
24+
curl -L https://tarantool.io/release/2/installer.sh | sudo bash
25+
sudo apt install -y tt
26+
tt version
27+
2228
- name: Setup luacheck
23-
run: tarantoolctl rocks install luacheck 0.25.0
29+
run: tt rocks install luacheck 0.25.0
2430

2531
- name: Run luacheck
2632
run: ./.rocks/bin/luacheck .

.github/workflows/reusable_testing.yml

+6
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ jobs:
3838
with:
3939
go-version: 1.13
4040

41+
- name: Setup tt
42+
run: |
43+
curl -L https://tarantool.io/release/2/installer.sh | sudo bash
44+
sudo apt install -y tt
45+
tt version
46+
4147
- name: Install test dependencies
4248
run: make deps
4349

.github/workflows/testing.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -358,9 +358,15 @@ jobs:
358358
run: echo "MallocNanoZone=0" >> $GITHUB_ENV
359359
if: matrix.runs-on == 'macos-12'
360360

361+
# Workaround issue https://github.com/tarantool/tt/issues/640
362+
- name: Fix tt rocks
363+
if: matrix.tarantool == 'brew'
364+
run: |
365+
brew ls --verbose tarantool | grep macosx.lua | xargs rm -f
366+
361367
- name: Install test dependencies
362368
run: |
363-
brew install luarocks
369+
brew install tt
364370
cd "${SRCDIR}"
365371
make deps
366372

Makefile

+3-6
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ BENCH_OPTIONS := -bench=. -run=^Benchmark -benchmem -benchtime=${DURATION} -coun
1414
GO_TARANTOOL_URL := https://github.com/tarantool/go-tarantool
1515
GO_TARANTOOL_DIR := ${PROJECT_DIR}/${BENCH_PATH}/go-tarantool
1616
TAGS :=
17-
TTCTL := tt
18-
ifeq (,$(shell which tt 2>/dev/null))
19-
TTCTL := tarantoolctl
20-
endif
2117

2218
.PHONY: clean
2319
clean:
@@ -26,8 +22,9 @@ clean:
2622

2723
.PHONY: deps
2824
deps: clean
29-
( cd ./queue/testdata; $(TTCTL) rocks install queue 1.3.0 )
30-
( cd ./crud/testdata; $(TTCTL) rocks install crud 1.4.1 )
25+
@(command -v tt > /dev/null || (echo "error: tt not found" && exit 1))
26+
( cd ./queue/testdata; tt rocks install queue 1.3.0 )
27+
( cd ./crud/testdata; tt rocks install crud 1.4.1 )
3128

3229
.PHONY: datetime-timezones
3330
datetime-timezones:

0 commit comments

Comments
 (0)