From 4a955f3bbbca226c29325e9240492709a339671b Mon Sep 17 00:00:00 2001
From: JackCarterSmith <jackcartersmith@jcsmith.fr>
Date: Sat, 13 Aug 2022 15:18:02 +0200
Subject: [PATCH] Jenkins damn it path missing

---
 Jenkinsfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index eec6465..f2abc2d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,7 @@ pipeline {
     stage('Prepare') {
       steps {
         cleanWs()
-        rtConanClient(id: "conan")
+        rtConanClient(id: "conan", userHome: "/home/jackcartersmith")
       }
     }
     stage('Build') {
@@ -35,7 +35,7 @@ pipeline {
 			  dir("build") {
                 rtConanRun(clientId: "conan", command: "install .. --profile=windows --build=missing")
               }
-              cmakeBuild buildDir: 'build', cmakeArgs: '-DGNU_HOST=x86_64-w64-mingw32 -DCMAKE_TOOLCHAIN_FILE=../mingw_cross_toolchain.cmake', installation: 'latest', steps: [[args: 'all']]
+              cmakeBuild buildDir: 'build', cmakeArgs: '-DGNU_HOST=x86_64-w64-mingw32 -DCMAKE_TOOLCHAIN_FILE=../cmake/mingw_cross_toolchain.cmake', installation: 'latest', steps: [[args: 'all']]
             }
           }
         )
@@ -44,10 +44,10 @@ pipeline {
     stage('Deploy') {
       steps {
         dir("zip_linux") {
-          sh 'cp -R ../linux/build/bin ../linux/build/lib ../linux/include .'
+          sh 'cp -R ../linux/build/bin ../linux/build/lib ../linux/RSPModelLib/include .'
         }
         dir("zip_win") {
-          sh 'cp -R ../windows/build/bin ../windows/build/lib ../windows/include .'
+          sh 'cp -R ../windows/build/bin ../windows/build/lib ../windows/RSPModelLib/include .'
         }
         zip archive: false, dir: 'zip_linux', exclude: '', glob: '', zipFile: 'linux_x64.zip'
         sh 'mv linux_x64.zip ${CI_OUTPUT_NAME}_${CI_VERSION}.${BUILD_NUMBER}_Linux_x86_64.zip'
@@ -60,7 +60,7 @@ pipeline {
     stage('Sign') {
       steps {
         sh 'ls -l'
-        sh 'gpg --batch --detach-sign -o ${CI_OUTPUT_NAME}_${CI_VERSION}.${BUILD_NUMBER}_Linux_x86_64.zip.gpg ${CI_OUTPUT_NAME}_${CI_VERSION}.${BUILD_NUMBER}_x64.zip'
+        sh 'gpg --batch --detach-sign -o ${CI_OUTPUT_NAME}_${CI_VERSION}.${BUILD_NUMBER}_Linux_x86_64.zip.gpg ${CI_OUTPUT_NAME}_${CI_VERSION}.${BUILD_NUMBER}_Linux_x86_64.zip'
         sh 'gpg --batch --detach-sign -o ${CI_OUTPUT_NAME}_${CI_VERSION}.${BUILD_NUMBER}_mingw64.zip.gpg ${CI_OUTPUT_NAME}_${CI_VERSION}.${BUILD_NUMBER}_mingw64.zip'
         archiveArtifacts(artifacts: '*.gpg')
         fingerprint(targets: '*.gpg')