define BOOST_DIR default value

remove cahcaing boost from GHA
RediSearch · Mar 24, 2024 · b385533 · b385533
1 parent 69bd9a1
commit b385533
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 83 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -161,13 +161,6 @@ commands:
           working_directory: .install
           command: |
             ./install_boost.sh $BOOST_VERSION
-      - run:
-          name: Define BOOST_DIR
-          shell: /bin/bash -l -eo pipefail
-          working_directory: .install/boost
-          command: |
-            echo 'export BOOST_DIR=$PWD/.install/boost' >> "$BASH_ENV"
-            echo ${BOOST_DIR}
 
       - run:
           name: Build (Search)

diff --git a/.github/workflows/benchmark-flow.yml b/.github/workflows/benchmark-flow.yml
@@ -49,22 +49,11 @@ jobs:
       - name: Git Config
         run: git config --global --add safe.directory '*'
 
-      - name: Restore Boost
-        id: restore-boost
-        uses: actions/cache@v3
-        with:
-          path: .install/boost
-          key: boost-${{ env.BOOST_VERSION }}-${{ inputs.container }}-${{ runner.arch }}
 
       - name: Install Boost
-        if: steps.restore-boost.outputs.cache-hit != 'true'
         working-directory: .install
         run: ./install_boost.sh ${{ env.BOOST_VERSION }}
 
-      - name: Define BOOST_DIR
-        working-directory: .install/boost
-        run: echo "BOOST_DIR=$PWD" >> $GITHUB_ENV
-
       - name: Get Redis
         uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/flow-coverage.yml b/.github/workflows/flow-coverage.yml
@@ -26,22 +26,10 @@ jobs:
     - name: Setup common
       run: .install/common_installations.sh sudo
 
-    - name: Restore Boost
-      id: restore-boost
-      uses: actions/cache@v3
-      with:
-        path: .install/boost
-        key: boost-${{ env.BOOST_VERSION }}-ubuntu-latest-${{ runner.arch }}
-
     - name: Install Boost
-      if: steps.restore-boost.outputs.cache-hit != 'true'
       working-directory: .install
       run: ./install_boost.sh ${{ env.BOOST_VERSION }} sudo
 
-    - name: Define BOOST_DIR
-      working-directory: .install/boost
-      run: echo "BOOST_DIR=$PWD" >> $GITHUB_ENV
-
     - name: Get Redis
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/task-build-artifacts.yml b/.github/workflows/task-build-artifacts.yml
@@ -72,22 +72,10 @@ jobs:
       - name: install build artifacts req
         run: pip install -q -r .install/build_package_requirments.txt
 
-      - name: Restore Boost
-        id: restore-boost
-        uses: actions/cache@v3
-        with:
-          path: .install/boost
-          key: boost-${{ env.BOOST_VERSION }}-${{ inputs.container || inputs.env }}-${{ runner.arch }}
-
       - name: Install Boost
-        if: steps.restore-boost.outputs.cache-hit != 'true'
         working-directory: .install
         run: ./install_boost.sh ${{ env.BOOST_VERSION }} ${{ steps.mode.outputs.mode }}
 
-      - name: Define BOOST_DIR
-        working-directory: .install/boost
-        run: echo "BOOST_DIR=$PWD" >> $GITHUB_ENV
-
       # Get Redis
       - name: Get Redis
         uses: actions/checkout@v3

diff --git a/.github/workflows/task-test.yml b/.github/workflows/task-test.yml
@@ -68,22 +68,10 @@ jobs:
       - name: Setup common
         run: .install/common_installations.sh ${{ steps.mode.outputs.mode }}
 
-      - name: Restore Boost
-        id: restore-boost
-        uses: actions/cache@v3
-        with:
-          path: .install/boost
-          key: boost-${{ env.BOOST_VERSION }}-${{ inputs.container || inputs.env }}-${{ runner.arch }}
-
       - name: Install Boost
-        if: steps.restore-boost.outputs.cache-hit != 'true'
         working-directory: .install
         run: ./install_boost.sh ${{ env.BOOST_VERSION }} ${{ steps.mode.outputs.mode }}
 
-      - name: Define BOOST_DIR
-        working-directory: .install/boost
-        run: echo "BOOST_DIR=$PWD" >> $GITHUB_ENV
-
       - name: Get Redis
         if: inputs.get-redis != 'skip getting redis'
         uses: actions/checkout@v3

diff --git a/.install/install_boost.sh b/.install/install_boost.sh
@@ -10,7 +10,3 @@ wget https://boostorg.jfrog.io/artifactory/main/release/${VERSION}/source/${BOOS
 
 tar -xzf ${BOOST_NAME}.tar.gz
 mv ${BOOST_NAME} ${BOOST_DIR}
-#cd ${BOOST_NAME}
-
-# ./bootstrap.sh --prefix=.
-# $MODE ./b2 headers --prefix=.
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ ROOT=.
 MK.cmake=1
 SRCDIR=.
 
-MACOS_PACKAGES=openssl# boost
+MACOS_PACKAGES=openssl
 
 include deps/readies/mk/main
 
@@ -32,7 +32,7 @@ make build          # compile and link
   GCC=1               # build with GCC (default unless Sanitizer)
   CLANG=1             # build with CLang
   STATIC_LIBSTDCXX=0  # link libstdc++ dynamically (default: 1)
-  BOOST_DIR= 		  # boost installation path (default: empty)
+  BOOST_DIR= 		  # boost installation path (default: .install/boost)
 make parsers       # build parsers code
 make clean         # remove build artifacts
   ALL=1|all          # remove entire artifacts directory (all: remove Conan artifacts)
@@ -237,25 +237,15 @@ CMAKE_FILES+= \
 endif
 
 #----------------------------------------------------------------------------------------------
+BOOST_DIR ?= $(ROOT)/.install/boost
 _CMAKE_FLAGS += -DMODULE_NAME=$(MODULE_NAME) -DBOOST_DIR=$(BOOST_DIR)
 
 ifeq ($(OS),macos)
 _CMAKE_FLAGS += -DLIBSSL_DIR=$(openssl_prefix)
-_CMAKE_FLAGS += -DCANON_BOOST=on
 endif
 
 _CMAKE_FLAGS += $(CMAKE_ARGS) $(CMAKE_STATIC) $(CMAKE_COORD) $(CMAKE_TEST)
 
-#----------------------------------------------------------------------------------------------
-
-# BOOST_INC_PATH.centos:=/usr/include/boost169
-# CC_INCLUDES.centos7 += $(BOOST_INC_PATH.centos)
-# CC_INCLUDES.centos8 += $(BOOST_INC_PATH.centos)
-
-# CC_INCLUDES.macos += $(BOOST_DIR)/include
-
-#----------------------------------------------------------------------------------------------
-
 include $(MK)/defs
 
 MK_CUSTOM_CLEAN=1

diff --git a/src/geometry/CMakeLists.txt b/src/geometry/CMakeLists.txt
@@ -7,18 +7,6 @@ file(GLOB SOURCES "*.cpp")
 add_library(redisearch-geometry STATIC ${SOURCES})
 
 # include_directories(${absl_INCLUDE_DIR})
-# if(CANON_BOOST)
-	# message(STATUS "using find_package")
-	# set(BOOST_ROOT ${BOOST_DIR})
-	# set(BOOST_INCLUDEDIR ${BOOST_DIR})
-
-	# find_package(Boost 1.82.0 PATHS ${BOOST_DIR}/boost)
-	# include_directories(${BOOST_DIR}/boost)
-	# if(NOT Boost_FOUND)
-	# 	message(FATAL_ERROR "Could not find boost! ${BOOST_ROOT}")
-	# 	message(FATAL_ERROR "Could not find boost!")
-	# endif()
-# endif()
 
 if(NOT BOOST_DIR STREQUAL "")
  	message(STATUS "BOOST_DIR is not empty: ${BOOST_DIR}")