diff --git a/build/jenkins/ImageMatcher b/build/jenkins/ImageMatcher index 733fd2c..0f36ab6 100644 --- a/build/jenkins/ImageMatcher +++ b/build/jenkins/ImageMatcher @@ -3,13 +3,14 @@ pipeline { // Ensure this runs on your Windows agent agent { label 'Win10-BuildMachine' // Specify the agent label type and value directly - workspace 'C:/Jenkins/workspace/BuildDependencies' + // Removed: workspace 'C:/Jenkins/workspace/BuildDependencies' + // We will use a dir() step in the stages block instead. } tools { // Define any tools needed specifically for building ImageMatcher - git 'Default' // Git is NOT needed for checkout in this pipeline - //dotnetsdk 'dotnet-sdk' // If ImageMatcher is a .NET project + git 'Default' // Git is NOT needed for checkout in this pipeline + // dotnetsdk 'dotnet-sdk' // If ImageMatcher is a .NET project } environment { @@ -17,31 +18,44 @@ pipeline { // REPO_GPS_DENIED_URL = 'git@github.com:azaion/gps-denied.git' // Not needed for checkout // Add any other environment variables needed for the build (e.g., build configuration) CONFIGURATION = 'Release' // Example build configuration + + // Define the path to the shared workspace + SHARED_WORKSPACE = 'C:/Jenkins/workspace/BuildDependencies' // Define shared workspace path } stages { - // Removed: stage('Checkout ImageMatcher Code') - Code is checked out by Dependencies pipeline - - stage('Build ImageMatcher') { + // Use a dir() step to ensure all subsequent steps run in the shared workspace + stage('Run in Shared Workspace') { steps { - echo 'Building ImageMatcher...' - // Add steps here to build the ImageMatcher project - // This might involve compiling code, running build scripts, etc. - // Based on your original script, this likely involves running a build.cmd - // The code is expected to be in the 'gps-denied' subdirectory due to the Dependencies pipeline checkout - dir('gps-denied\\image-matcher') { // Change directory to the ImageMatcher build location - bat 'build.cmd' // Replace with the actual build command - } + dir(env.SHARED_WORKSPACE) { + echo "Changing directory to shared workspace: ${env.SHARED_WORKSPACE}" + + // Removed: stage('Checkout ImageMatcher Code') - Code is checked out by Dependencies pipeline + + stage('Build ImageMatcher') { + steps { + echo 'Building ImageMatcher...' + // Add steps here to build the ImageMatcher project + // This might involve compiling code, running build scripts, etc. + // Based on your original script, this likely involves running a build.cmd + // The code is expected to be in the 'gps-denied' subdirectory relative to the shared workspace + dir('gps-denied\\image-matcher') { // Change directory to the ImageMatcher build location relative to SHARED_WORKSPACE + bat 'build.cmd' // Replace with the actual build command + } + } + } + + // Optional: Archive ImageMatcher build artifacts if needed by Azaion Build + // stage('Archive ImageMatcher Artifacts') { + // steps { + // echo 'Archiving ImageMatcher artifacts...' + // // Path is relative to the current directory (SHARED_WORKSPACE) + // archiveArtifacts artifacts: 'path/to/imagematcher/build/output/**' // Adjust path + // } + // } + } // end dir(env.SHARED_WORKSPACE) } } - - // Optional: Archive ImageMatcher build artifacts if needed by Azaion Build - // stage('Archive ImageMatcher Artifacts') { - // steps { - // echo 'Archiving ImageMatcher artifacts...' - // archiveArtifacts artifacts: 'path/to/imagematcher/build/output/**' // Adjust path - // } - // } } post {