Get rid of Mason (Project-OSRM#6387)

mattwigway · Jul 20, 2023 · 8e61b23 · 8e61b23
1 parent b32196a
commit 8e61b23
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 245 deletions.
diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml
@@ -568,40 +568,25 @@ jobs:
 
         if [[ "${RUNNER_OS}" == "Linux" ]]; then
           echo "JOBS=$((`nproc` + 1))" >>  $GITHUB_ENV
-          export MASON_OS=linux
         elif [[ "${RUNNER_OS}" == "macOS" ]]; then
           echo "JOBS=$((`sysctl -n hw.ncpu` + 1))" >>  $GITHUB_ENV
-          sudo mdutil -i off /
-          export MASON_OS=osx
         fi
-        echo "MASON=${GITHUB_WORKSPACE}/scripts/mason.sh" >> $GITHUB_ENV
 
-        echo "CMAKE_URL=https://mason-binaries.s3.amazonaws.com/${MASON_OS}-x86_64/cmake/${CMAKE_VERSION}.tar.gz" >> $GITHUB_ENV
-        echo "CMAKE_DIR=mason_packages/${MASON_OS}-x86_64/cmake/${CMAKE_VERSION}" >> $GITHUB_ENV
     - name: Install dev dependencies
       run: |
         python3 -m pip install conan==1.51.3
 
-        # CMake
-        mkdir -p ${CMAKE_DIR}
-        wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C ${CMAKE_DIR}
-        echo "${CMAKE_DIR}/bin" >> $GITHUB_PATH
-
         # ccache
-        ${MASON} install ccache ${CCACHE_VERSION}
-        echo "$(${MASON} prefix ccache ${CCACHE_VERSION})/bin" >> $GITHUB_PATH
-
+        if [[ "${RUNNER_OS}" == "Linux" ]]; then
+          sudo apt-get update -y && sudo apt-get install ccache
+        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
-        # we only enable lto for release builds
-        # and therefore don't need to us ld.gold or llvm tools for linking
-        # for debug builds
-        if [[ "${CCOMPILER}" == clang-* ]] && [[ ${BUILD_TYPE} == 'Release' ]]; then
-          ${MASON} install binutils 2.27
-          echo "$(${MASON} prefix binutils 2.27)/bin" >> $GITHUB_PATH
-        fi
 
         # Linux dev packages
         if [ "${TARGET_ARCH}" != "i686" ] && [ "${ENABLE_CONAN}" != "ON" ]; then

diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,3 @@
-# mason #
-#########
-/.mason
-/mason_packages
-
 # pre compiled dependencies #
 #############################
 osrm-deps

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@
       - FIXED: Internal refactoring of identifier types used in data facade [#6044](https://github.com/Project-OSRM/osrm-backend/pull/6044)
       - CHANGED: Update docs to reflect recent build and dependency changes [#6383](https://github.com/Project-OSRM/osrm-backend/issues/6383)
     - Build:
+      - REMOVED: Get rid of Mason. [#6387](https://github.com/Project-OSRM/osrm-backend/pull/6387)
       - CHANGED: Use clang-format from CI base image. [#6391](https://github.com/Project-OSRM/osrm-backend/pull/6391)
       - ADDED: Build Node bindings on Windows. [#6334](https://github.com/Project-OSRM/osrm-backend/pull/6334)
       - ADDED: Configure cross-compilation for Apple Silicon. [#6360](https://github.com/Project-OSRM/osrm-backend/pull/6360)

diff --git a/cmake/mason.cmake b/cmake/mason.cmake
diff --git a/scripts/mason.sh b/scripts/mason.sh
diff --git a/src/nodejs/CMakeLists.txt b/src/nodejs/CMakeLists.txt
@@ -34,7 +34,7 @@ foreach(binary ${OSRM_BINARIES})
   list(APPEND ARTIFACTS "${BINDING_DIR}/${binary}")
 endforeach(binary)
 
-# For mason-enabled builds we copy over tbb's shared objects for packaging.
+# For Conan-enabled builds we copy over tbb's shared objects for packaging.
 # TODO: consider using statically linked tbb library (for node_osrm only!)
 if (ENABLE_CONAN)
   foreach(libpath ${CONAN_LIB_DIRS_ONETBB})