commit 0b168a024e40f3f1e15364f3fd51c6a21d083168 from: Sergey Bronnikov date: Tue Oct 11 08:50:26 2022 UTC Fix 'check' workflow commit - 6b831cb253cbe6b4e7ab5d56d487905618f14fcd commit + 0b168a024e40f3f1e15364f3fd51c6a21d083168 blob - 70c59ea2cdd62f1d7ae87cd5a74a649e24465b90 blob + 246223fa07dadf71215350e059ead65c5cf698c8 --- .github/workflows/check.yaml +++ .github/workflows/check.yaml @@ -18,13 +18,10 @@ jobs: - name: Setup Tarantool uses: tarantool/setup-tarantool@v1 with: - tarantool-version: 2.10 + tarantool-version: "2.10" - - name: Setup Lua rocks dependencies + - name: Setup dependencies run: make deps - #- run: echo $(tarantoolctl rocks config deploy_bin_dir) >> $GITHUB_PATH - - run: echo .rocks/bin >> $GITHUB_PATH - - name: Run static analysis run: make check blob - e60e52619d8edd5e395dcc23985811cb7802fab0 blob + 6aad2e91e328076cab3ae8076c23d5b8d7704d84 --- Makefile +++ Makefile @@ -3,24 +3,22 @@ # `make -f /path/to/project/Makefile`. MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) PROJECT_DIR := $(patsubst %/,%,$(dir $(MAKEFILE_PATH))) +ROCKS_BIN_DIR := $(shell tarantoolctl rocks config deploy_bin_dir) -ROCKS_BIN_DIR := $(tarantoolctl rocks config deploy_bin_dir) -ROCKS_BIN_DIR = $(PROJECT_DIR)/.rocks/bin/ - all: test deps: - @tarantoolctl rocks install luacheck 0.25.0 - @tarantoolctl rocks install luatest + @tarantoolctl rocks install luacheck 0.25.0 --server=https://rocks.tarantool.org/ + @tarantoolctl rocks install luatest --server=https://rocks.tarantool.org/ @tarantoolctl rocks install https://raw.githubusercontent.com/ligurio/molly/dev/molly-scm-1.rockspec check: luacheck luacheck: - @luacheck --config $(PROJECT_DIR)/.luacheckrc --codes $(PROJECT_DIR) + @${ROCKS_BIN_DIR}/luacheck --config ${PROJECT_DIR}/.luacheckrc --codes ${PROJECT_DIR} test: - @${ROCKS_BIN_DIR}/luatest --verbose -c test/ + @${ROCKS_BIN_DIR}/luatest --verbose -c ${PROJECT_DIR}/test/ clean: @rm -f ${CLEANUP_FILES}