ci: remove tarantoolctl

Part of tarantool/tarantool#9443
tarantool · Jan 18, 2024 · bd2997b · bd2997b
1 parent 02a8820
commit bd2997b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
@@ -19,8 +19,14 @@ jobs:
       with:
         tarantool-version: '2.8'
 
+    - name: Setup tt
+      run: |
+        curl -L https://tarantool.io/release/2/installer.sh | sudo bash
+        sudo apt install -y tt
+        tt version
+
     - name: Setup luacheck
-      run: tarantoolctl rocks install luacheck 0.25.0
+      run: tt rocks install luacheck 0.25.0
 
     - name: Run luacheck
       run: ./.rocks/bin/luacheck .

diff --git a/.github/workflows/reusable_testing.yml b/.github/workflows/reusable_testing.yml
@@ -38,6 +38,12 @@ jobs:
         with:
           go-version: 1.13
 
+      - name: Setup tt
+        run: |
+          curl -L https://tarantool.io/release/2/installer.sh | sudo bash
+          sudo apt install -y tt
+          tt version
+
       - name: Install test dependencies
         run: make deps
 

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -358,9 +358,15 @@ jobs:
         run: echo "MallocNanoZone=0" >> $GITHUB_ENV
         if: matrix.runs-on  == 'macos-12'
 
+      # Workaround issue https://github.com/tarantool/tt/issues/640
+      - name: Fix tt rocks
+        if: matrix.tarantool == 'brew'
+        run: |
+          brew ls --verbose tarantool | grep macosx.lua | xargs rm -f
+
       - name: Install test dependencies
         run:  |
-          brew install luarocks
+          brew install tt
           cd "${SRCDIR}"
           make deps
 

diff --git a/Makefile b/Makefile
@@ -14,10 +14,6 @@ BENCH_OPTIONS := -bench=. -run=^Benchmark -benchmem -benchtime=${DURATION} -coun
 GO_TARANTOOL_URL := https://github.com/tarantool/go-tarantool
 GO_TARANTOOL_DIR := ${PROJECT_DIR}/${BENCH_PATH}/go-tarantool
 TAGS :=
-TTCTL := tt
-ifeq (,$(shell which tt 2>/dev/null))
-	TTCTL := tarantoolctl
-endif
 
 .PHONY: clean
 clean:
@@ -26,8 +22,9 @@ clean:
 
 .PHONY: deps
 deps: clean
-	( cd ./queue/testdata; $(TTCTL) rocks install queue 1.3.0 )
-	( cd ./crud/testdata; $(TTCTL) rocks install crud 1.4.1 )
+	@(command -v tt > /dev/null || (echo "error: tt not found" && exit 1))
+	( cd ./queue/testdata; tt rocks install queue 1.3.0 )
+	( cd ./crud/testdata; tt rocks install crud 1.4.1 )
 
 .PHONY: datetime-timezones
 datetime-timezones: