Skip to content

Commit afbd285

Browse files
Try this
1 parent 802c84a commit afbd285

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

.github/workflows/testing.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,23 @@ jobs:
173173
with:
174174
distribution: Ubuntu-20.04
175175

176-
- name: Setup test Tarantool
176+
- name: Install Tarantool ${{ matrix.tarantool }}
177+
if: matrix.tarantool != '2.x-latest'
178+
shell: wsl-bash_Ubuntu-20.04 {0}
179+
run: |
180+
curl -L https://tarantool.io/installer.sh | VER=${{ matrix.tarantool }} sudo bash
181+
sudo apt install -y tarantool tarantool-dev
182+
183+
- name: Install latest Tarantool 2.x
184+
if: matrix.tarantool == '2.x-latest'
177185
shell: wsl-bash_Ubuntu-20.04 {0}
178186
run: |
179187
curl -L https://tarantool.io/pre-release/2/installer.sh | sudo bash
180188
sudo apt install -y tarantool tarantool-dev
189+
190+
- name: Setup test Tarantool
191+
shell: wsl-bash_Ubuntu-20.04 {0}
192+
run: |
181193
TNT_PID=$(tarantool ./test/suites/lib/tarantool_python_ci.lua > tarantool.log 2>&1 & echo $!)
182194
rm -f ./tnt_pid
183195
touch tnt_pid
@@ -190,6 +202,6 @@ jobs:
190202
run: make test
191203

192204
- name: Stop test Tarantool
193-
if: ${{ always() }} && process.env.TNT_PID != ''
205+
if: ${{ always() }}
194206
shell: wsl-bash_Ubuntu-20.04 {0}
195-
run: kill $(cat tnt_pid)
207+
run: kill $(cat tnt_pid) || true

0 commit comments

Comments
 (0)