Skip to content

Commit 10fb041

Browse files
committed
deps: test
1 parent 8e43371 commit 10fb041

File tree

2 files changed

+12
-40
lines changed

2 files changed

+12
-40
lines changed

.github/workflows/test_on_push.yaml

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
metrics-version: "1.1.0"
2626
vshard-version: "0.1.36"
2727
- tarantool-version: "2.11"
28-
external-merger-version: "0.0.5"
29-
external-keydef-version: "0.0.4"
28+
external-tuple-merger-version: "0.0.5"
29+
external-tuple-keydef-version: "0.0.4"
3030
- tarantool-version: "3.0"
3131
vshard-version: "0.1.36"
3232
- tarantool-version: "3.1"
@@ -127,25 +127,11 @@ jobs:
127127

128128
- name: Run tests
129129
if: matrix.coveralls != true # See https://github.com/actions/runner/issues/1173
130-
uses: nick-fields/retry@v3
131-
with:
132-
max_attempts: 3
133-
retry_on: error
134-
retry_wait_seconds: 10
135-
timeout_minutes: 40
136-
command: |
137-
make -C build luatest-no-coverage
130+
run: make -C build luatest-no-coverage
138131

139132
- name: Run tests with coverage and send results to coveralls.io
140133
if: ${{ matrix.coveralls }}
141-
uses: nick-fields/retry@v3
142-
with:
143-
max_attempts: 3
144-
retry_on: error
145-
retry_wait_seconds: 10
146-
timeout_minutes: 40
147-
command: |
148-
make -C build coveralls
134+
run: make -C build coveralls
149135

150136
run-tests-ee:
151137
if: github.event_name == 'push'
@@ -205,14 +191,7 @@ jobs:
205191
- run: cmake -S . -B build
206192

207193
- name: Run tests
208-
uses: nick-fields/retry@v3
209-
with:
210-
max_attempts: 3
211-
retry_on: error
212-
retry_wait_seconds: 10
213-
timeout_minutes: 40
214-
command: |
215-
make -C build luatest-no-coverage
194+
run: make -C build luatest-no-coverage
216195

217196
run-perf-tests-ce:
218197
if: |
@@ -313,11 +292,4 @@ jobs:
313292
- run: cmake -S . -B build
314293

315294
- name: Run performance tests
316-
uses: nick-fields/retry@v3
317-
with:
318-
max_attempts: 3
319-
retry_on: error
320-
retry_wait_seconds: 10
321-
timeout_minutes: 60
322-
command: |
323-
make -C build performance
295+
run: make -C build performance

deps.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ fi
1616
# Test dependencies:
1717
${TTCTL} rocks install luatest 1.0.1
1818
${TTCTL} rocks install luacheck 0.26.0
19-
${TTCTL} rocks install https://raw.githubusercontent.com/luarocks/cluacov/master/cluacov-dev-1.rockspec
20-
${TTCTL} rocks install https://luarocks.org/manifests/dhkolf/dkjson-2.8-1.rockspec
21-
${TTCTL} rocks install https://raw.githubusercontent.com/keplerproject/luafilesystem/master/luafilesystem-scm-1.rockspec
22-
${TTCTL} rocks install https://raw.githubusercontent.com/moteus/lua-path/master/rockspecs/lua-path-scm-0.rockspec
23-
2419

2520
if [[ -n "${CARTRIDGE_VERSION}" ]]
2621
then
22+
${TTCTL} rocks install https://raw.githubusercontent.com/luarocks/cluacov/master/cluacov-dev-1.rockspec
23+
${TTCTL} rocks install https://luarocks.org/manifests/dhkolf/dkjson-2.8-1.rockspec
24+
${TTCTL} rocks install https://raw.githubusercontent.com/keplerproject/luafilesystem/master/luafilesystem-scm-1.rockspec
25+
${TTCTL} rocks install https://raw.githubusercontent.com/moteus/lua-path/master/rockspecs/lua-path-scm-0.rockspec
26+
${TTCTL} rocks install luacov-coveralls --only-server=https://luarocks.org/
27+
2728
${TTCTL} rocks install cartridge "${CARTRIDGE_VERSION}"
2829
${TTCTL} rocks install migrations 1.1.0
29-
${TTCTL} rocks install luacov-coveralls --only-server=https://luarocks.org/
3030
else
3131
${TTCTL} rocks install vshard "${VSHARD_VERSION:-0.1.36}"
3232
fi

0 commit comments

Comments
 (0)