Skip to content

Commit

Permalink
added a step that copies thirdparty.inc from external dir to the spee…
Browse files Browse the repository at this point in the history
…db project. It is required for the build in order to reflect the environment on the runner machine (#442)
  • Loading branch information
maxb-io authored and Yuval-Ariel committed May 2, 2023
1 parent e05309a commit 2be66b1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci_macos.yml
Original file line number Diff line number Diff line change
@@ -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


Expand All @@ -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
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/ci_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 2be66b1

Please sign in to comment.