Skip to content

Commit 7f88b3f

Browse files
authored
ci: upgrade macOS versions in CI workflow to 26 (#7486)
* Update macOS versions in CI workflow * Update macOS runner version in workflow * Upgrade conan version * Upgrade Windows conan version * implement workaround * Revert "implement workaround" This reverts commit 08549a1. * one more macos workaround attempt
1 parent 9e1c57d commit 7f88b3f

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

.github/workflows/osrm-backend.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
5252
python3 -m venv .venv
5353
source .venv/Scripts/Activate
54-
python3 -m pip install conan==2.15.1
54+
python3 -m pip install conan==2.27.1
5555
conan profile detect --force
5656
5757
cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON ..
@@ -346,7 +346,7 @@ jobs:
346346
build_node_package: true
347347
continue-on-error: true
348348
node: 24
349-
runs-on: macos-15-intel # x86_64
349+
runs-on: macos-26-intel # x86_64
350350
BUILD_TYPE: Release
351351
CCOMPILER: clang
352352
CXXCOMPILER: clang++
@@ -357,7 +357,7 @@ jobs:
357357
build_node_package: true
358358
continue-on-error: true
359359
node: 24
360-
runs-on: macos-15 # arm64
360+
runs-on: macos-26 # arm64
361361
BUILD_TYPE: Release
362362
CCOMPILER: clang
363363
CXXCOMPILER: clang++
@@ -518,8 +518,12 @@ jobs:
518518
if [[ "${ENABLE_CONAN}" == "ON" ]]; then
519519
python3 -m venv .venv
520520
source .venv/bin/activate
521-
python3 -m pip install conan==2.15.1
521+
python3 -m pip install conan==2.27.1
522522
conan profile detect --force
523+
if [[ "${RUNNER_OS}" == "macOS" ]]; then
524+
CONAN_DEFAULT_PROFILE="$(conan profile path default)"
525+
perl -0pi -e 's/^compiler\.version=.*/compiler.version=17/m' "${CONAN_DEFAULT_PROFILE}"
526+
fi
523527
fi
524528
525529
ccache --zero-stats

0 commit comments

Comments
 (0)