Skip to content

Commit e68baf4

Browse files
committed
ci: add optional metrics and cartridge installation
Into the GitHub workflow and the Makefile. Closes #100
1 parent 2ebe150 commit e68baf4

File tree

3 files changed

+29
-3
lines changed

3 files changed

+29
-3
lines changed

.github/workflows/fast_testing.yaml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,34 @@ jobs:
2424
- '2.6'
2525
- '2.7'
2626
- '2.8'
27+
- '2.10'
28+
metrics-version:
29+
- ''
30+
- '0.10.0'
31+
- '0.11.0'
32+
- '0.13.0'
2733
coveralls: [false]
2834
include:
29-
- tarantool: '2.8'
35+
- tarantool: '2.10'
36+
metrics-version: '0.13.0'
3037
coveralls: true
3138

3239
runs-on: ubuntu-latest
3340
steps:
34-
- name: Install tarantool ${{ matrix.tarantool }}
41+
- name: Install tarantool ${{ matrix.tarantool }} (< 2.10)
42+
if: matrix.tarantool != '2.10'
3543
uses: tarantool/setup-tarantool@v1
3644
with:
3745
tarantool-version: ${{ matrix.tarantool }}
3846

47+
# It's a temporary hack. May be removed after the fix:
48+
# https://github.com/tarantool/setup-tarantool/issues/19
49+
- name: Install tarantool ${{ matrix.tarantool }} (2.10)
50+
if: matrix.tarantool == '2.10'
51+
run: |
52+
curl -L https://tarantool.io/tWsLBdI/release/2/installer.sh | bash
53+
sudo apt install -y tarantool tarantool-dev
54+
3955
- name: Clone the module
4056
uses: actions/checkout@v2
4157

@@ -50,6 +66,12 @@ jobs:
5066
run: make deps
5167
if: steps.cache-rocks.outputs.cache-hit != 'true'
5268

69+
- name: Install cartridge and metrics
70+
if: matrix.metrics-version != ''
71+
run: |
72+
tarantoolctl rocks install cartridge 2.7.4
73+
tarantoolctl rocks install metrics ${{ matrix.metrics-version }}
74+
5375
- run: echo $PWD/.rocks/bin >> $GITHUB_PATH
5476

5577
- run: make check

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,9 @@ deps:
6060
tarantoolctl rocks install luacov-coveralls 0.2.3-1 --server=http://luarocks.org
6161
tarantoolctl rocks make
6262

63+
deps-full: deps
64+
tarantoolctl rocks install cartridge 2.7.4
65+
tarantoolctl rocks install metrics 0.13.0
66+
6367
clean:
6468
rm -rf ${CLEANUP_FILES}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,6 @@ expirationd.start(job_name, space.id, is_expired, {
131131
## Testing
132132

133133
```
134-
$ make deps
134+
$ make deps-full
135135
$ make test
136136
```

0 commit comments

Comments
 (0)