diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index 9ec0def8f..ba8b7b72a 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.59.0 + - run: pip install conan<2.0.0 - run: conan --version - run: cmake --version - uses: actions/setup-node@v3 @@ -400,7 +400,7 @@ jobs: - name: Install dev dependencies run: | - python3 -m pip install conan==1.59.0 + python3 -m pip install conan<2.0.0 # 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 diff --git a/CHANGELOG.md b/CHANGELOG.md index db0403f2c..d982d87f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Unreleased - Changes from 5.27.1 - Build: - - CHANGED: Bump Conan to version 1.59.0. [#6559](https://github.com/Project-OSRM/osrm-backend/pull/6559) + - CHANGED: Always install the latest Conan 1.x on CI. [#6559](https://github.com/Project-OSRM/osrm-backend/pull/6559) - ADDED: Add CI job which builds OSRM with gcc 12. [#6455](https://github.com/Project-OSRM/osrm-backend/pull/6455) - CHANGED: Upgrade to clang-tidy 15. [#6439](https://github.com/Project-OSRM/osrm-backend/pull/6439) - CHANGED: Update actions/cache to v3. [#6420](https://github.com/Project-OSRM/osrm-backend/pull/6420)