From 77f38dae85d63de0b434194ab75c8749f3ee23f4 Mon Sep 17 00:00:00 2001 From: Nir Azkiel Date: Sun, 12 Dec 2021 10:03:45 +0200 Subject: [PATCH 1/3] update windows machined label to 2019 --- .github/workflows/buildsCI.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/buildsCI.yaml b/.github/workflows/buildsCI.yaml index 068dc1aefa..dca207e976 100644 --- a/.github/workflows/buildsCI.yaml +++ b/.github/workflows/buildsCI.yaml @@ -14,7 +14,7 @@ env: jobs: Windows_testing_cpp_USB_Win7: - runs-on: windows-2016 + runs-on: windows-2019 timeout-minutes: 60 env: VS15: false @@ -84,7 +84,7 @@ jobs: fi Windows_cpp: - runs-on: windows-2016 + runs-on: windows-2019 timeout-minutes: 60 env: VS15: true @@ -124,7 +124,7 @@ jobs: # well on Windows or Mac. You can convert this to a matrix build if you need # cross-platform coverage. # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix - runs-on: windows-2016 + runs-on: windows-2019 timeout-minutes: 60 env: VS15: true From 18e755aaee61695f79bc54ab3fa901e8d0075ee5 Mon Sep 17 00:00:00 2001 From: Nir Azkiel Date: Sun, 12 Dec 2021 10:15:48 +0200 Subject: [PATCH 2/3] build windows with VS2019 as VS2017 is not installed --- .github/workflows/buildsCI.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/buildsCI.yaml b/.github/workflows/buildsCI.yaml index dca207e976..4b0122771a 100644 --- a/.github/workflows/buildsCI.yaml +++ b/.github/workflows/buildsCI.yaml @@ -44,7 +44,7 @@ jobs: cd build pwd ls - cmake .. -G "Visual Studio 15 2017 Win64" -DPYTHON_EXECUTABLE=${{env.PYTHON_PATH}} -DBUILD_PYTHON_BINDINGS=true -DPYBIND11_PYTHON_VERSION=3.8 -DBUILD_UNIT_TESTS=false -DBUILD_LEGACY_LIVE_TEST=true -DBUILD_EXAMPLES=false -DBUILD_TOOLS=false -DBUILD_WITH_TM2=false -DFORCE_RSUSB_BACKEND=true + cmake .. -G "Visual Studio 16 2019" -DPYTHON_EXECUTABLE=${{env.PYTHON_PATH}} -DBUILD_PYTHON_BINDINGS=true -DPYBIND11_PYTHON_VERSION=3.8 -DBUILD_UNIT_TESTS=false -DBUILD_LEGACY_LIVE_TEST=true -DBUILD_EXAMPLES=false -DBUILD_TOOLS=false -DBUILD_WITH_TM2=false -DFORCE_RSUSB_BACKEND=true - name: Build # Build your program with the given configuration @@ -110,7 +110,7 @@ jobs: cd build pwd ls - cmake .. -G "Visual Studio 15 2017 Win64" -DBUILD_EXAMPLES=true -DBUILD_WITH_TM2=true -DCHECK_FOR_UPDATES=true + cmake .. -G "Visual Studio 16 2019" -DBUILD_EXAMPLES=true -DBUILD_WITH_TM2=true -DCHECK_FOR_UPDATES=true - name: Build # Build your program with the given configuration @@ -150,7 +150,7 @@ jobs: cd build pwd ls - cmake .. -G "Visual Studio 15 2017 Win64" -DBUILD_EXAMPLES=false -DBUILD_TOOLS=false -DBUILD_CSHARP_BINDINGS=true -DDOTNET_VERSION_LIBRARY="4.5" -DDOTNET_VERSION_EXAMPLES="4.5" -DCHECK_FOR_UPDATES=true + cmake .. -G "Visual Studio 16 2019" -DBUILD_EXAMPLES=false -DBUILD_TOOLS=false -DBUILD_CSHARP_BINDINGS=true -DDOTNET_VERSION_LIBRARY="4.5" -DDOTNET_VERSION_EXAMPLES="4.5" -DCHECK_FOR_UPDATES=true - name: Build # Build your program with the given configuration From 54a84702f9604f2fe4db9a0565a52c181d384e76 Mon Sep 17 00:00:00 2001 From: Nir Azkiel Date: Sun, 12 Dec 2021 10:30:55 +0200 Subject: [PATCH 3/3] update openssl link --- .github/workflows/buildsCI.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/buildsCI.yaml b/.github/workflows/buildsCI.yaml index 4b0122771a..7754d57a00 100644 --- a/.github/workflows/buildsCI.yaml +++ b/.github/workflows/buildsCI.yaml @@ -304,8 +304,8 @@ jobs: run: | cd scripts && ./api_check.sh && cd .. mkdir build - #brew uninstall xctool; - #brew install xctool --HEAD; + # install coreutils for greadlink use + brew install coreutils brew install homebrew/core/glfw3; brew list libusb || brew install libusb; @@ -313,7 +313,9 @@ jobs: run: | cd build # `OPENSSL_ROOT_DIR` setting is Used by libcurl for 'CHECK_FOR_UPDATES' capability - export OPENSSL_ROOT_DIR=`readlink /usr/local/opt/openssl` + # We use "greadlink -f" which is mac-os parallel command to "readlink -f" from Linux (-f to convert relative link to absolute link) + export OPENSSL_ROOT_DIR=`greadlink -f /usr/local/opt/openssl@1.1` + echo "OPENSSL_ROOT_DIR = ${OPENSSL_ROOT_DIR}" cmake .. -DBUILD_EXAMPLES=true -DBUILD_WITH_OPENMP=false -DHWM_OVER_XU=false -DCHECK_FOR_UPDATES=true cmake --build . --config ${{env.LRS_BUILD_CONFIG}} -- -j4 ls