Skip to content

Commit

Permalink
ci: remove tarantoolctl
Browse files Browse the repository at this point in the history
  • Loading branch information
0x501D committed Jan 11, 2024
1 parent 5378b93 commit d4fa3b4
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 10 deletions.
10 changes: 9 additions & 1 deletion .github/workflows/check_on_push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,16 @@ jobs:
with:
tarantool-version: '2.10'

- 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 init
tt rocks install luacheck 0.25.0
- run: cmake -S . -B build

Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/reusable_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,19 @@ jobs:
sudo dpkg -i tarantool_*.deb tarantool-common_*.deb tarantool-dev_*.deb
tarantool --version
- name: Setup tt
run: |
curl -L https://tarantool.io/release/2/installer.sh | sudo bash
sudo apt install -y tt
tt version
- name: Install requirements
run: ./deps.sh

- name: Install metrics
run: tarantoolctl rocks install metrics 1.0.0
run: |
tt init
tt rocks install metrics 1.0.0
# This server starts and listen on 8084 port that is used for tests
- name: Stop Mono server
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_on_push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,6 @@ jobs:
tar -xzf ${{ matrix.tarantool-version.bundle }}.tar.gz
rm -f ${{ matrix.tarantool-version.bundle }}.tar.gz
sudo cp tarantool-enterprise/tarantool /usr/bin/tarantool
sudo rm tarantool-enterprise/tt
source tarantool-enterprise/env.sh
tarantool --version
./deps.sh
Expand All @@ -271,7 +270,8 @@ jobs:
if: matrix.metrics-version != ''
run: |
source tarantool-enterprise/env.sh
tarantoolctl rocks install metrics ${{ matrix.metrics-version }}
tt init
tt rocks install metrics ${{ matrix.metrics-version }}
# This server starts and listen on 8084 port that is used for tests
- name: Stop Mono server
Expand Down
8 changes: 2 additions & 6 deletions deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,8 @@ set -e
TTCTL=tt
if ! [ -x "$(command -v tt)" ];
then
if ! [ -x "$(command -v tarantoolctl)" ];
then
echo "tt or tarantoolctl not found"
exit 1
fi
TTCTL=tarantoolctl
echo "tt not found"
exit 1
fi

# Test dependencies:
Expand Down

0 comments on commit d4fa3b4

Please sign in to comment.