Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Bump Conan version

Browse Source
This commit is contained in:
Michael Bell 2022-10-10 12:35:10 +01:00
parent a901f64ffd
commit 4a5d9c92c0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/osrm-backend.yml vendored
View File

@ -29,7 +29,7 @@ jobs:
ENABLE_APPLE_SILICON: "OFF" ENABLE_APPLE_SILICON: "OFF"
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- run: pip install conan==1.51.3 - run: pip install conan==1.53.0
- run: conan --version - run: conan --version
- run: cmake --version - run: cmake --version
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
@ -252,7 +252,7 @@ jobs:
CXXFLAGS: "-m32 -msse2 -mfpmath=sse" CXXFLAGS: "-m32 -msse2 -mfpmath=sse"
TARGET_ARCH: i686 TARGET_ARCH: i686
ENABLE_CONAN: ON ENABLE_CONAN: ON
- name: gcc-8-release - name: gcc-8-release
continue-on-error: false continue-on-error: false
node: 12 node: 12
@ -460,7 +460,7 @@ jobs:
CUCUMBER_TIMEOUT: 60000 CUCUMBER_TIMEOUT: 60000
ENABLE_ASSERTIONS: ON ENABLE_ASSERTIONS: ON
ENABLE_CONAN: ON ENABLE_CONAN: ON
- name: conan-macos-arm64-release-node-lts - name: conan-macos-arm64-release-node-lts
build_node_package: true build_node_package: true
continue-on-error: true continue-on-error: true
@ -553,7 +553,7 @@ jobs:
key: v3-test-${{ matrix.name }}-${{ github.sha }} key: v3-test-${{ matrix.name }}-${{ github.sha }}
restore-keys: | restore-keys: |
v3-test-${{ matrix.name }}- v3-test-${{ matrix.name }}-
- name: Prepare environment - name: Prepare environment
run: | run: |
PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)") PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)")
@ -574,7 +574,7 @@ jobs:
- name: Install dev dependencies - name: Install dev dependencies
run: | run: |
python3 -m pip install conan==1.51.3 python3 -m pip install conan==1.53.0
# ccache # ccache
if [[ "${RUNNER_OS}" == "Linux" ]]; then if [[ "${RUNNER_OS}" == "Linux" ]]; then
@ -582,12 +582,12 @@ jobs:
elif [[ "${RUNNER_OS}" == "macOS" ]]; then elif [[ "${RUNNER_OS}" == "macOS" ]]; then
brew install ccache brew install ccache
fi fi
# clang # clang
if [[ "${CCOMPILER}" == "clang-6.0" ]]; then if [[ "${CCOMPILER}" == "clang-6.0" ]]; then
sudo apt-get update -y && sudo apt-get install clang++-6 sudo apt-get update -y && sudo apt-get install clang++-6
fi fi
# Linux dev packages # Linux dev packages
if [ "${TARGET_ARCH}" != "i686" ] && [ "${ENABLE_CONAN}" != "ON" ]; then if [ "${TARGET_ARCH}" != "i686" ] && [ "${ENABLE_CONAN}" != "ON" ]; then
sudo apt-get update -y sudo apt-get update -y
@ -697,7 +697,7 @@ jobs:
run: | run: |
pushd ${OSRM_BUILD_DIR} pushd ${OSRM_BUILD_DIR}
make --jobs=${JOBS} benchmarks make --jobs=${JOBS} benchmarks
./src/benchmarks/alias-bench ./src/benchmarks/alias-bench
./src/benchmarks/json-render-bench ../src/benchmarks/portugal_to_korea.json ./src/benchmarks/json-render-bench ../src/benchmarks/portugal_to_korea.json
./src/benchmarks/match-bench ../test/data/ch/monaco.osrm ./src/benchmarks/match-bench ../test/data/ch/monaco.osrm
./src/benchmarks/packedvector-bench ./src/benchmarks/packedvector-bench