diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index 6ee78a6c7..e278fd539 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -29,7 +29,7 @@ jobs: ENABLE_APPLE_SILICON: "OFF" steps: - uses: actions/checkout@v3 - - run: pip install conan==1.51.3 + - run: pip install conan==1.53.0 - run: conan --version - run: cmake --version - uses: actions/setup-node@v3 @@ -252,7 +252,7 @@ jobs: CXXFLAGS: "-m32 -msse2 -mfpmath=sse" TARGET_ARCH: i686 ENABLE_CONAN: ON - + - name: gcc-8-release continue-on-error: false node: 12 @@ -460,7 +460,7 @@ jobs: CUCUMBER_TIMEOUT: 60000 ENABLE_ASSERTIONS: ON ENABLE_CONAN: ON - + - name: conan-macos-arm64-release-node-lts build_node_package: true continue-on-error: true @@ -553,7 +553,7 @@ jobs: key: v3-test-${{ matrix.name }}-${{ github.sha }} restore-keys: | v3-test-${{ matrix.name }}- - + - name: Prepare environment run: | PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)") @@ -574,7 +574,7 @@ jobs: - name: Install dev dependencies run: | - python3 -m pip install conan==1.51.3 + python3 -m pip install conan==1.53.0 # ccache if [[ "${RUNNER_OS}" == "Linux" ]]; then @@ -582,12 +582,12 @@ jobs: elif [[ "${RUNNER_OS}" == "macOS" ]]; then brew install ccache fi - + # clang if [[ "${CCOMPILER}" == "clang-6.0" ]]; then sudo apt-get update -y && sudo apt-get install clang++-6 fi - + # Linux dev packages if [ "${TARGET_ARCH}" != "i686" ] && [ "${ENABLE_CONAN}" != "ON" ]; then sudo apt-get update -y @@ -697,7 +697,7 @@ jobs: run: | pushd ${OSRM_BUILD_DIR} 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/match-bench ../test/data/ch/monaco.osrm ./src/benchmarks/packedvector-bench diff --git a/CHANGELOG.md b/CHANGELOG.md index aa275c159..47b0d9b41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ # Unreleased + +# 5.27.0 - Changes from 5.26.0 - API: - ADDED: Add Flatbuffers support to NodeJS bindings. [#6338](https://github.com/Project-OSRM/osrm-backend/pull/6338) diff --git a/README.md b/README.md index cdbf2292d..91f6037fb 100644 --- a/README.md +++ b/README.md @@ -58,16 +58,16 @@ Download OpenStreetMap extracts for example from [Geofabrik](http://download.geo Pre-process the extract with the car profile and start a routing engine HTTP server on port 5000 - docker run -t -v "${PWD}:/data" osrm/osrm-backend osrm-extract -p /opt/car.lua /data/berlin-latest.osm.pbf + docker run -t -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-extract -p /opt/car.lua /data/berlin-latest.osm.pbf The flag `-v "${PWD}:/data"` creates the directory `/data` inside the docker container and makes the current working directory `"${PWD}"` available there. The file `/data/berlin-latest.osm.pbf` inside the container is referring to `"${PWD}/berlin-latest.osm.pbf"` on the host. - docker run -t -v "${PWD}:/data" osrm/osrm-backend osrm-partition /data/berlin-latest.osrm - docker run -t -v "${PWD}:/data" osrm/osrm-backend osrm-customize /data/berlin-latest.osrm + docker run -t -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-partition /data/berlin-latest.osrm + docker run -t -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-customize /data/berlin-latest.osrm Note there is no `berlin-latest.osrm` file, but multiple `berlin-latest.osrm.*` files, i.e. `berlin-latest.osrm` is not file path, but "base" path referring to set of files and there is an option to omit this `.osrm` suffix completely(e.g. `osrm-partition /data/berlin-latest`). - docker run -t -i -p 5000:5000 -v "${PWD}:/data" osrm/osrm-backend osrm-routed --algorithm mld /data/berlin-latest.osrm + docker run -t -i -p 5000:5000 -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-routed --algorithm mld /data/berlin-latest.osrm Make requests against the HTTP server diff --git a/package.json b/package.json index f4b8aef3d..fb0b1f9c5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@project-osrm/osrm", - "version": "5.27.0-unreleased", + "version": "5.28.0-unreleased", "private": false, "description": "The Open Source Routing Machine is a high performance routing engine written in C++14 designed to run on OpenStreetMap data.", "dependencies": {