From 2853284751eed0b4f7065298094ab69480e03f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Cie=C5=9Blak?= Date: Wed, 30 Oct 2024 13:53:33 +0100 Subject: [PATCH] Makefile: link nim tests to status-go and bump nim-tests docker image --- Makefile | 6 +++--- ci/Jenkinsfile.tests-nim | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 396f4546ec..b402ce743c 100644 --- a/Makefile +++ b/Makefile @@ -853,9 +853,9 @@ run-windows: compile_windows_resources nim_status_client $(NIM_WINDOWS_PREBUILT_ NIM_TEST_FILES := $(wildcard test/nim/*.nim) NIM_TESTS := $(foreach test_file,$(NIM_TEST_FILES),nim-test-run/$(test_file)) -nim-test-run/%: | dotherside - LD_LIBRARY_PATH="$(QT5_LIBDIR):$(LD_LIBRARY_PATH)" $(ENV_SCRIPT) \ - nim c $(NIM_PARAMS) $(NIM_EXTRA_PARAMS) -r $(subst nim-test-run/,,$@) +nim-test-run/%: | dotherside $(STATUSGO) + LD_LIBRARY_PATH="$(QT5_LIBDIR)":"$(STATUSGO_LIBDIR)":"$(LD_LIBRARY_PATH)" $(ENV_SCRIPT) \ + nim c $(NIM_PARAMS) $(NIM_EXTRA_PARAMS) --passL:"-L$(STATUSGO_LIBDIR)" --passL:"-lstatus" -r $(subst nim-test-run/,,$@) tests-nim-linux: $(NIM_TESTS) diff --git a/ci/Jenkinsfile.tests-nim b/ci/Jenkinsfile.tests-nim index fae45e3af2..9bd2340aec 100644 --- a/ci/Jenkinsfile.tests-nim +++ b/ci/Jenkinsfile.tests-nim @@ -8,7 +8,7 @@ pipeline { agent { docker { 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' } }