Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gh actions update windows label & fix mac-os OpenSSL link #10047

Merged
merged 3 commits into from
Dec 13, 2021
Merged

Gh actions update windows label & fix mac-os OpenSSL link #10047

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77f38da
update windows machined label to 2019
Nir-Az Dec 12, 2021
18e755a
build windows with VS2019 as VS2017 is not installed
Nir-Az Dec 12, 2021
54a8470
update openssl link
Nir-Az Dec 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions .github/workflows/buildsCI.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
fi

Windows_cpp:
runs-on: windows-2016
runs-on: windows-2019
timeout-minutes: 60
env:
VS15: true
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -304,16 +304,18 @@ 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;

- name: Build
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
Expand Down