From 22245ea62552f81fb2ca8b4fd8330b4025d1fb07 Mon Sep 17 00:00:00 2001 From: Yasser Date: Fri, 26 Mar 2021 11:02:12 +0100 Subject: [PATCH] fix: JenkinsFile update, add SolARpipeline to packagedependencies.txt --- JenkinsFile | 14 ++++---------- packagedependencies.txt | 1 + 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/JenkinsFile b/JenkinsFile index 50d174b..abb76e4 100644 --- a/JenkinsFile +++ b/JenkinsFile @@ -1,25 +1,19 @@ node("master") { - SolArModulePipeline { - moduleName="FiducialMarker" - dirName="SolARBuild" - buildDir="SolARSample_FiducialMarker_Mono" - android=false - packageScripts="bundleSamples" - } - SolArModulePipeline { moduleName="SolARPipeline_FiducialMarker" dirName="SolARBuild" buildDir="SolARPipeline_FiducialMarker" android=true + makeTarget="install install_deps" packageScripts="bundleSamples" } SolArModulePipeline { - moduleName="FiducialMarker_Test" + moduleName="FiducialMarker" dirName="SolARBuild" - buildDir="SolARPipeline_FiducialMarker/tests/SolARPipelineTest_FiducialMarker" + buildDir="SolARSample_FiducialMarker_Mono,SolARPipeline_FiducialMarker/tests/SolARPipelineTest_FiducialMarker" + makeTarget="install install_deps" android=false packageScripts="bundleSamples" } diff --git a/packagedependencies.txt b/packagedependencies.txt index 7cd5526..5edbb72 100644 --- a/packagedependencies.txt +++ b/packagedependencies.txt @@ -1,3 +1,4 @@ SolARModuleOpenCV|0.9.0|SolARModuleOpenCV|SolARBuild@github|https://github.com/SolarFramework/SolarModuleOpenCV/releases/download SolARModuleTools|0.9.0|SolARModuleTools|SolARBuild@github|https://github.com/SolarFramework/SolARModuleTools/releases/download +SolARPipeline_FiducialMarker|0.9.0|SolARPipeline_FiducialMarker|SolARBuild@github|https://github.com/SolarFramework/Sample-FiducialMarker/releases/download