From 336b0eb9a5e503207bf87e4eff41b31b735845ad Mon Sep 17 00:00:00 2001 From: Aleksander Klenov Date: Wed, 23 Oct 2024 14:10:15 +0700 Subject: [PATCH 1/4] Rerun tests --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8560e61..d96f8dd 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # Tracing for Tarantool + ![tracing-img](https://user-images.githubusercontent.com/8830475/68295738-17abe800-00a4-11ea-855f-d46589b89bed.png) `Tracing` module for Tarantool includes the following parts: From 7f3ba31625b19c568a8d4da852779f38f2d8ecae Mon Sep 17 00:00:00 2001 From: Aleksander Klenov Date: Wed, 23 Oct 2024 17:36:35 +0700 Subject: [PATCH 2/4] Fix --- Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 6a9fecb..7cdf1e4 100644 --- a/Makefile +++ b/Makefile @@ -22,11 +22,12 @@ TEST_FILES := \ .PHONY: unit unit: - TEST_RESULT=0; \ - for f in $(TEST_FILES); do \ - echo -e '\nExecuting test '$(basename $$f)'...'; \ - $$f; \ - let TEST_RESULT=$$TEST_RESULT+$$?; \ - [ $$TEST_RESULT -gt 0 ] && exit $$TEST_RESULT; \ - done; \ - exit $$TEST_RESULT + TEST_RESULT=0; \ + for f in $(TEST_FILES); do \ + echo -e '\nExecuting test '$(basename $$f)'...'; \ + tarantool -e "require('luacov.runner')(); dofile('$$f')" || TEST_RESULT=$$?; \ + [ $$TEST_RESULT -gt 0 ] && exit $$TEST_RESULT; \ + done; \ + luacov; \ + luacov-console; \ + exit $$TEST_RESULT From a8e6cab3f72541e9998cc06b8bd98fc44faaab6a Mon Sep 17 00:00:00 2001 From: Aleksander Klenov Date: Wed, 23 Oct 2024 18:16:51 +0700 Subject: [PATCH 3/4] CI fix --- .github/workflows/test_on_push.yaml | 12 ++++++++++++ Makefile | 18 +++++++++--------- README.md | 1 - 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test_on_push.yaml b/.github/workflows/test_on_push.yaml index 6cf1238..7eb5f29 100644 --- a/.github/workflows/test_on_push.yaml +++ b/.github/workflows/test_on_push.yaml @@ -49,15 +49,27 @@ jobs: tarantoolctl rocks install luacheck 0.25.0 export PATH=.rocks/bin:$PATH tarantoolctl rocks make + - name: Run linter run: | .rocks/bin/luacheck ./tracing --config=.luacheckrc --no-redefined --no-unused-args .rocks/bin/luacheck ./test --config=.luacheckrc --no-redefined --no-unused-args + + - name: Setup Java 17 + uses: actions/setup-java@v2 + with: + distribution: 'temurin' # See 'Supported distributions' for available options + java-version: '17' + + - name: Check Java version + run: java -version + - name: Run tests run: | java -jar zipkin.jar & sleep 10 make unit + - name: Build doc run: .rocks/bin/ldoc -t "$ROCK_NAME-${version}" -p "$ROCK_NAME (${version})" --all . diff --git a/Makefile b/Makefile index 7cdf1e4..1378ec0 100644 --- a/Makefile +++ b/Makefile @@ -22,12 +22,12 @@ TEST_FILES := \ .PHONY: unit unit: - TEST_RESULT=0; \ - for f in $(TEST_FILES); do \ - echo -e '\nExecuting test '$(basename $$f)'...'; \ - tarantool -e "require('luacov.runner')(); dofile('$$f')" || TEST_RESULT=$$?; \ - [ $$TEST_RESULT -gt 0 ] && exit $$TEST_RESULT; \ - done; \ - luacov; \ - luacov-console; \ - exit $$TEST_RESULT + TEST_RESULT=0; \ + for f in $(TEST_FILES); do \ + echo -e '\nExecuting test '$(basename $$f)'...'; \ + tarantool -e "require('luacov.runner')(); dofile('$$f')" || TEST_RESULT=$$?; \ + [ $$TEST_RESULT -gt 0 ] && exit $$TEST_RESULT; \ + done; \ + luacov; \ + luacov-console; \ + exit $$TEST_RESULT diff --git a/README.md b/README.md index d96f8dd..8560e61 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # Tracing for Tarantool - ![tracing-img](https://user-images.githubusercontent.com/8830475/68295738-17abe800-00a4-11ea-855f-d46589b89bed.png) `Tracing` module for Tarantool includes the following parts: From ca923fc24683328d07ad5fe50de4a039c3f7b091 Mon Sep 17 00:00:00 2001 From: Aleksander Klenov Date: Wed, 23 Oct 2024 18:42:45 +0700 Subject: [PATCH 4/4] CI fix --- .github/workflows/test_on_push.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test_on_push.yaml b/.github/workflows/test_on_push.yaml index 7eb5f29..5ff9a79 100644 --- a/.github/workflows/test_on_push.yaml +++ b/.github/workflows/test_on_push.yaml @@ -47,6 +47,8 @@ jobs: curl -sSL https://zipkin.io/quickstart.sh | bash -s tarantoolctl rocks install ldoc --server=http://rocks.moonscript.org tarantoolctl rocks install luacheck 0.25.0 + tarantoolctl rocks install luacov 0.13.0 + tarantoolctl rocks install luacov-reporters 0.1.0 export PATH=.rocks/bin:$PATH tarantoolctl rocks make