status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Makefile: link nim tests to status-go and bump nim-tests docker image

This commit is contained in:
Michał Cieślak 2024-10-30 13:53:33 +01:00 committed by Michał
parent 28f6bee90e
commit 2853284751
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -853,9 +853,9 @@ run-windows: compile_windows_resources nim_status_client $(NIM_WINDOWS_PREBUILT_
NIM_TEST_FILES := $(wildcard test/nim/*.nim) NIM_TEST_FILES := $(wildcard test/nim/*.nim)
NIM_TESTS := $(foreach test_file,$(NIM_TEST_FILES),nim-test-run/$(test_file)) NIM_TESTS := $(foreach test_file,$(NIM_TEST_FILES),nim-test-run/$(test_file))
nim-test-run/%: | dotherside nim-test-run/%: | dotherside $(STATUSGO)
LD_LIBRARY_PATH="$(QT5_LIBDIR):$(LD_LIBRARY_PATH)" $(ENV_SCRIPT) \ LD_LIBRARY_PATH="$(QT5_LIBDIR)":"$(STATUSGO_LIBDIR)":"$(LD_LIBRARY_PATH)" $(ENV_SCRIPT) \
nim c $(NIM_PARAMS) $(NIM_EXTRA_PARAMS) -r $(subst nim-test-run/,,$@) nim c $(NIM_PARAMS) $(NIM_EXTRA_PARAMS) --passL:"-L$(STATUSGO_LIBDIR)" --passL:"-lstatus" -r $(subst nim-test-run/,,$@)
tests-nim-linux: $(NIM_TESTS) tests-nim-linux: $(NIM_TESTS)

2
ci/Jenkinsfile.tests-nim
View File

@ -8,7 +8,7 @@ pipeline {
agent { agent {
docker { docker {
label 'linux' label 'linux'
image 'statusteam/nim-status-client-build:1.2.1-qt5.15.2' image 'statusteam/nim-status-client-build:1.5.0-qt5.15.2'
} }
} }