From 22031b8dd41a039c30f150c6f77ccf42886903ba Mon Sep 17 00:00:00 2001
From: maxb-io <105273783+maxb-io@users.noreply.github.com>
Date: Sun, 19 Mar 2023 15:56:20 +0200
Subject: [PATCH] added a step that copies thirdparty.inc from external dir to
 the speedb project. It is required for the build in order to reflect the
 environment on the runner machine (#442)

---
 .github/workflows/ci_macos.yml   | 4 ++--
 .github/workflows/ci_windows.yml | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci_macos.yml b/.github/workflows/ci_macos.yml
index 8390f13af9..3e6daf75ac 100644
--- a/.github/workflows/ci_macos.yml
+++ b/.github/workflows/ci_macos.yml
@@ -1,6 +1,6 @@
 # This workflow will build Speedb on a Mac OS server
 #
-# This workflow assumes the self hosted runner on a Windows machine is ready.
+# This workflow assumes the self hosted runner on a Mac machine is ready.
 # The Mac OS server must have all the tools and software required for Speedb building to be installed
 
 
@@ -11,7 +11,7 @@ on:
 
 jobs:
   build-and-deploy:
-    runs-on: macOSi86 # a test self hosted runner on a win vm
+    runs-on: macOSi86 # a test self hosted runner on a vm with MacOS
     steps:
     - name: 'Checkout GitHub Action'
       uses: actions/checkout@v3
diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml
index 8a0676fdcb..08d49a76ec 100644
--- a/.github/workflows/ci_windows.yml
+++ b/.github/workflows/ci_windows.yml
@@ -19,10 +19,9 @@ jobs:
     - name: 'build and present'
       shell: powershell # For Linux, use bash
       run: |
+        $env:THIRDPARTY_HOME='C:/Users/builder/code'
+        cp  $env:THIRDPARTY_HOME\thirdparty.inc .   # copy the thirdparty.inc that reflects the env on the runner machine
         mkdir runner_bld
         cd runner_bld
-        echo "seeing thirdparty_home"
-        $env:THIRDPARTY_HOME='C:/Users/builder/code'
-                
         cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=20 -DJNI=1 -DGFLAGS=1 -DSNAPPY=1 -DLZ4=1 -DZLIB=1 -DZSTD=1 -DXPRESS=1 -DFAIL_ON_WARNINGS=0 ..
         msbuild speedb.sln /p:Configuration=Release /t:speedbjni-shared