diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index 5f1bae1d1..c20b8ca66 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -331,7 +331,7 @@ jobs: build_node_package: true continue-on-error: true node: 20 - runs-on: macos-11 + runs-on: macos-13 # x86_64 BUILD_TYPE: Release CCOMPILER: clang CXXCOMPILER: clang++ @@ -343,7 +343,7 @@ jobs: build_node_package: true continue-on-error: true node: 20 - runs-on: macos-11 + runs-on: macos-14 # arm64 BUILD_TYPE: Release CCOMPILER: clang CXXCOMPILER: clang++ @@ -376,7 +376,8 @@ jobs: OSRM_CONNECTION_EXP_BACKOFF_COEF: ${{ matrix.OSRM_CONNECTION_EXP_BACKOFF_COEF }} steps: - uses: actions/checkout@v3 - + - name: Build machine architecture + run: uname -m - name: Use Node.js uses: actions/setup-node@v3 with: @@ -399,9 +400,9 @@ jobs: uses: actions/cache@v3 with: path: ~/.conan - key: v7-conan-${{ matrix.name }}-${{ github.sha }} + key: v9-conan-${{ matrix.name }}-${{ github.sha }} restore-keys: | - v7-conan-${{ matrix.name }}- + v9-conan-${{ matrix.name }}- - name: Enable test cache uses: actions/cache@v3 with: @@ -430,7 +431,7 @@ jobs: - name: Install dev dependencies run: | - python3 -m pip install "conan<2.0.0" + python3 -m pip install "conan<2.0.0" "numpy" --break-system-packages # workaround for issue that GitHub Actions seems to not adding it to PATH after https://github.com/actions/runner-images/pull/6499 # and that's why CI cannot find conan executable installed above @@ -493,16 +494,6 @@ jobs: echo "Using ${JOBS} jobs" pushd ${OSRM_BUILD_DIR} - # handle Apple Silicon cross compilation - if [[ "${ENABLE_APPLE_SILICON}" == "ON" ]]; then - ARCH=arm64 - TARGET="${ARCH}-apple-darwin" - CFLAGS="$CFLAGS --target=$TARGET" - CXXFLAGS="$CXXFLAGS --target=$TARGET" - APPLE_SILICON_FLAGS=(-DCMAKE_C_COMPILER_TARGET="$TARGET" -DCMAKE_CXX_COMPILER_TARGET="$TARGET" -DCMAKE_SYSTEM_PROCESSOR="${ARCH}" -DCMAKE_SYSTEM_NAME="Darwin" -DCMAKE_C_FLAGS="$CFLAGS" -DCMAKE_CXX_FLAGS="$CXXFLAGS") - else - APPLE_SILICON_FLAGS=() - fi cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ -DENABLE_CONAN=${ENABLE_CONAN:-OFF} \ @@ -514,12 +505,10 @@ jobs: -DENABLE_SANITIZER=${ENABLE_SANITIZER:-OFF} \ -DBUILD_TOOLS=${BUILD_TOOLS:-OFF} \ -DENABLE_CCACHE=ON \ - -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR} \ - "${APPLE_SILICON_FLAGS[@]}" - + -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR} make --jobs=${JOBS} - if [[ "${NODE_PACKAGE_TESTS_ONLY}" != "ON" && "${ENABLE_APPLE_SILICON}" != "ON" ]]; then + if [[ "${NODE_PACKAGE_TESTS_ONLY}" != "ON" ]]; then make tests --jobs=${JOBS} make benchmarks --jobs=${JOBS} ccache -s @@ -531,14 +520,14 @@ jobs: fi popd - name: Build example - if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY != 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }} + if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY != 'ON' }} run: | mkdir example/build && pushd example/build cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} make --jobs=${JOBS} popd - name: Run all tests - if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY != 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }} + if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY != 'ON' }} run: | make -C test/data benchmark @@ -567,32 +556,32 @@ jobs: popd - name: Use Node 18 - if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }} + if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }} uses: actions/setup-node@v3 with: node-version: 18 - name: Run Node package tests on Node 18 - if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }} + if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }} run: | node --version npm run nodejs-tests - name: Use Node 20 - if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }} + if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }} uses: actions/setup-node@v3 with: node-version: 20 - name: Run Node package tests on Node 20 - if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }} + if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }} run: | node --version npm run nodejs-tests - name: Use Node latest - if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }} + if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }} uses: actions/setup-node@v3 with: node-version: latest - name: Run Node package tests on Node-latest - if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }} + if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }} run: | node --version npm run nodejs-tests diff --git a/CMakeLists.txt b/CMakeLists.txt index deff32848..555d52fc1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -330,7 +330,7 @@ if(ENABLE_CONAN) conan_check(REQUIRED) - set(CONAN_BOOST_VERSION "1.79.0@#96e4902111a2e343a8ba0aa95391bb58") + set(CONAN_BOOST_VERSION "1.85.0@#14265ec82b25d91305bbb3b30d3357f8") set(CONAN_BZIP2_VERSION "1.0.8@#d1b2d5816f25865acf978501dff1f897") set(CONAN_EXPAT_VERSION "2.2.10@#916908d4a570ad839edd25322c3268cd") set(CONAN_LUA_VERSION "5.4.4@#3ec62efc37cd0a5d80b9e5cb35277360")