Pin Conan revisions correctly (#6828)
* Pin Conan revisions correctly Conan dependencies are not pinned correctly. This means we're pulling in a newer onetbb recipe that no longer has a shared library option. Following other examples of how to pin revisions with cmake for conan v1, we correctly pin the expected revisions. Longer term we should look into - upgrading to conan v2 - defining the conan config separately from cmakelists.txt - understanding the need for disabling onetbb shared library support but for the purposes of reviving CI, this will be sufficient. * Fix macos CI builds
This commit is contained in:
@@ -369,9 +369,9 @@ jobs:
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ~/.conan
|
||||
key: v6-conan-${{ matrix.name }}-${{ github.sha }}
|
||||
key: v7-conan-${{ matrix.name }}-${{ github.sha }}
|
||||
restore-keys: |
|
||||
v6-conan-${{ matrix.name }}-
|
||||
v7-conan-${{ matrix.name }}-
|
||||
- name: Enable test cache
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
@@ -462,6 +462,12 @@ jobs:
|
||||
fi
|
||||
echo "CC=${CCOMPILER}" >> $GITHUB_ENV
|
||||
echo "CXX=${CXXCOMPILER}" >> $GITHUB_ENV
|
||||
if [[ "${RUNNER_OS}" == "macOS" ]]; then
|
||||
# missing from GCC path, needed for conan builds of libiconv, for example.
|
||||
sudo xcode-select --switch /Library/Developer/CommandLineTools
|
||||
echo "LIBRARY_PATH=${LIBRARY_PATH}:/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib" >> $GITHUB_ENV
|
||||
echo "CPATH=${CPATH}:/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include" >> $GITHUB_ENV
|
||||
fi
|
||||
|
||||
- name: Build and install OSRM
|
||||
run: |
|
||||
|
||||
Reference in New Issue
Block a user