Skip to content

Commit 7be9039

Browse files
Get rid of Mason (#6387)
1 parent 52b516e commit 7be9039

File tree

6 files changed

+8
-245
lines changed

6 files changed

+8
-245
lines changed

.github/workflows/osrm-backend.yml

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -568,40 +568,25 @@ jobs:
568568
569569
if [[ "${RUNNER_OS}" == "Linux" ]]; then
570570
echo "JOBS=$((`nproc` + 1))" >> $GITHUB_ENV
571-
export MASON_OS=linux
572571
elif [[ "${RUNNER_OS}" == "macOS" ]]; then
573572
echo "JOBS=$((`sysctl -n hw.ncpu` + 1))" >> $GITHUB_ENV
574-
sudo mdutil -i off /
575-
export MASON_OS=osx
576573
fi
577-
echo "MASON=${GITHUB_WORKSPACE}/scripts/mason.sh" >> $GITHUB_ENV
578574
579-
echo "CMAKE_URL=https://mason-binaries.s3.amazonaws.com/${MASON_OS}-x86_64/cmake/${CMAKE_VERSION}.tar.gz" >> $GITHUB_ENV
580-
echo "CMAKE_DIR=mason_packages/${MASON_OS}-x86_64/cmake/${CMAKE_VERSION}" >> $GITHUB_ENV
581575
- name: Install dev dependencies
582576
run: |
583577
python3 -m pip install conan==1.51.3
584578
585-
# CMake
586-
mkdir -p ${CMAKE_DIR}
587-
wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C ${CMAKE_DIR}
588-
echo "${CMAKE_DIR}/bin" >> $GITHUB_PATH
589-
590579
# ccache
591-
${MASON} install ccache ${CCACHE_VERSION}
592-
echo "$(${MASON} prefix ccache ${CCACHE_VERSION})/bin" >> $GITHUB_PATH
593-
580+
if [[ "${RUNNER_OS}" == "Linux" ]]; then
581+
sudo apt-get update -y && sudo apt-get install ccache
582+
elif [[ "${RUNNER_OS}" == "macOS" ]]; then
583+
brew install ccache
584+
fi
585+
594586
# clang
595587
if [[ "${CCOMPILER}" == "clang-6.0" ]]; then
596588
sudo apt-get update -y && sudo apt-get install clang++-6
597589
fi
598-
# we only enable lto for release builds
599-
# and therefore don't need to us ld.gold or llvm tools for linking
600-
# for debug builds
601-
if [[ "${CCOMPILER}" == clang-* ]] && [[ ${BUILD_TYPE} == 'Release' ]]; then
602-
${MASON} install binutils 2.27
603-
echo "$(${MASON} prefix binutils 2.27)/bin" >> $GITHUB_PATH
604-
fi
605590

606591
# Linux dev packages
607592
if [ "${TARGET_ARCH}" != "i686" ] && [ "${ENABLE_CONAN}" != "ON" ]; then

.gitignore

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
# mason #
2-
#########
3-
/.mason
4-
/mason_packages
5-
61
# pre compiled dependencies #
72
#############################
83
osrm-deps

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
- FIXED: Internal refactoring of identifier types used in data facade [#6044](https://github.com/Project-OSRM/osrm-backend/pull/6044)
2828
- CHANGED: Update docs to reflect recent build and dependency changes [#6383](https://github.com/Project-OSRM/osrm-backend/issues/6383)
2929
- Build:
30+
- REMOVED: Get rid of Mason. [#6387](https://github.com/Project-OSRM/osrm-backend/pull/6387)
3031
- CHANGED: Use clang-format from CI base image. [#6391](https://github.com/Project-OSRM/osrm-backend/pull/6391)
3132
- ADDED: Build Node bindings on Windows. [#6334](https://github.com/Project-OSRM/osrm-backend/pull/6334)
3233
- ADDED: Configure cross-compilation for Apple Silicon. [#6360](https://github.com/Project-OSRM/osrm-backend/pull/6360)

cmake/mason.cmake

Lines changed: 0 additions & 215 deletions
This file was deleted.

scripts/mason.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/nodejs/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ foreach(binary ${OSRM_BINARIES})
3434
list(APPEND ARTIFACTS "${BINDING_DIR}/${binary}")
3535
endforeach(binary)
3636

37-
# For mason-enabled builds we copy over tbb's shared objects for packaging.
37+
# For Conan-enabled builds we copy over tbb's shared objects for packaging.
3838
# TODO: consider using statically linked tbb library (for node_osrm only!)
3939
if (ENABLE_CONAN)
4040
foreach(libpath ${CONAN_LIB_DIRS_ONETBB})

0 commit comments

Comments
 (0)