From 197e79dd07cc2c1f2b284c585383564c04d70f19 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Mon, 30 Oct 2023 10:02:55 -0500
Subject: [PATCH] fix mingw64 jenkins build

---
 .jenkins_linux_builds | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/.jenkins_linux_builds b/.jenkins_linux_builds
index 994c849d..72b8dd3f 100644
--- a/.jenkins_linux_builds
+++ b/.jenkins_linux_builds
@@ -6,7 +6,7 @@ pipeline {
   environment {
     BUILD_ARGS = '--build . -j 8'
     CONFIGURE_ARGS = '../.. -DCMAKE_BUILD_TYPE=Release -DREPERTORY_ENABLE_S3=ON' 
-    CONFIGURE_MINGW64_ARGS = '../.. -DCMAKE_BUILD_TYPE=Release -DREPERTORY_ENABLE_S3=ON -DCMAKE_TOOLCHAIN_FILE=../../cmake/mingw-w64-x86_64.cmake' 
+    CONFIGURE_MINGW64_ARGS = '../.. -DCMAKE_BUILD_TYPE=Release -DREPERTORY_ENABLE_S3=ON -DCMAKE_TOOLCHAIN_FILE=${WORKSPACE}/cmake/mingw-w64-x86_64.cmake' 
     REPERTORY_TEST_DIR = "${HOME}/.ci/cfg"
   }
 
@@ -27,6 +27,24 @@ pipeline {
       }
     }
 
+    stage('mingw64') {
+      agent {
+        dockerfile {
+          filename 'mingw64'
+          dir 'docker/64_bit'
+        }
+      }
+
+      steps {
+        retry(2) {
+          sleep time: 5, unit: 'SECONDS'
+          cmake arguments: "${env.CONFIGURE_MINGW64_ARGS}", installation: 'InSearchPath', workingDir: 'build/mingw64'
+          cmake arguments: "${env.BUILD_ARGS}", installation: 'InSearchPath', workingDir: 'build/mingw64'
+          sh 'strip build/mingw64/repertory.exe'
+        }
+      }
+    }
+
     stage('alpine') {
       agent {
         dockerfile {
@@ -64,24 +82,6 @@ pipeline {
       }
     }
 
-    stage('mingw64') {
-      agent {
-        dockerfile {
-          filename 'mingw64'
-          dir 'docker/64_bit'
-        }
-      }
-
-      steps {
-        retry(2) {
-          sleep time: 5, unit: 'SECONDS'
-          cmake arguments: "${env.CONFIGURE_MINGW64_ARGS}", installation: 'InSearchPath', workingDir: 'build/mingw64'
-          cmake arguments: "${env.BUILD_ARGS}", installation: 'InSearchPath', workingDir: 'build/mingw64'
-          sh 'strip build/mingw64/repertory.exe'
-        }
-      }
-    }
-
     stage('deliver') {
       agent any