[2.8] Fix boost installation (#4552)

* add boost installation to benchmark flow (cherry picked from commit d2acd6e) * remove sudo (cherry picked from commit 0e8456c) * run circleci (cherry picked from commit a03ca90) * identation? (cherry picked from commit ec67308) * fix wroking dir (cherry picked from commit 9b0f28c) * try export to bashrc (cherry picked from commit 2f2f5f6) * identation (cherry picked from commit 825b2db) * remove specifci boost on mac from makefile (cherry picked from commit 04d2a2e) * try find package (cherry picked from commit 91aceeb) * try path (cherry picked from commit a248683) * don't try to install boost, try download (cherry picked from commit 3cb9dc1) * fix BOOST_DIR (cherry picked from commit 9e62fec) * try diffrent path (cherry picked from commit 529407b) * rerun circle, run macos GHA (cherry picked from commit 69bd9a1) * define BOOST_DIR default value remove cahcaing boost from GHA (cherry picked from commit b385533) * config.yml and flow-temp cleanup (cherry picked from commit 7042288) * update git ignore update comment in Makefile (cherry picked from commit 9fd106e) * revert change in Makefile (cherry picked from commit b32392c) --------- Co-authored-by: meiravgri <meirav.grimberg@redis.com>
RediSearch · Mar 25, 2024 · c1535c6 · c1535c6
1 parent b75521d
commit c1535c6
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 61 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -156,10 +156,12 @@ commands:
           redis_version: <<parameters.redis_version>>
           getredis_params: <<parameters.getredis_params>>
       - run:
-          name: Prepare Conan dependencies
+          name: Install boost
           shell: /bin/bash -l -eo pipefail
+          working_directory: .install
           command: |
-            make conan <<parameters.build_params>> SHOW=1 NPROC=16
+            ./install_boost.sh $BOOST_VERSION
+
       - run:
           name: Build (Search)
           shell: /bin/bash -l -eo pipefail
@@ -884,10 +886,11 @@ jobs:
       - checkout-all
       - install-prerequisites
       - run:
-          name: Prepare Conan dependencies
+          name: Install boost
           shell: /bin/bash -l -eo pipefail
+          working_directory: .install
           command: |
-            make conan SHOW=1 NPROC=16
+            ./install_boost.sh $BOOST_VERSION
       - run:
           name: Build & Test
           shell: /bin/bash -l -eo pipefail
@@ -912,10 +915,11 @@ jobs:
       - checkout-all
       - install-prerequisites
       - run:
-          name: Prepare Conan dependencies
+          name: Install boost
           shell: /bin/bash -l -eo pipefail
+          working_directory: .install
           command: |
-            make conan SAN=<<parameters.san-type>> SHOW=1
+            ./install_boost.sh $BOOST_VERSION
       - run:
           name: Build & test (Search)
           shell: /bin/bash -l -eo pipefail
@@ -942,10 +946,11 @@ jobs:
       - early-returns
       - checkout-all
       - run:
-          name: Prepare Conan dependencies
+          name: Install boost
           shell: /bin/bash -l -eo pipefail
+          working_directory: .install
           command: |
-            make conan VG=1 SHOW=1 NPROC=16
+            ./install_boost.sh $BOOST_VERSION
       - run:
           name: Build & Test
           shell: /bin/bash -l -eo pipefail

diff --git a/.github/workflows/benchmark-flow.yml b/.github/workflows/benchmark-flow.yml
@@ -32,6 +32,8 @@ on:
       benchmark_runner_group_total:
         type: number
         default: 1
+env:
+  BOOST_VERSION: ${{ vars.BOOST_VERSION }}
 
 jobs:
   benchmark-steps:
@@ -46,6 +48,12 @@ jobs:
         run: ./sbin/setup
       - name: Git Config
         run: git config --global --add safe.directory '*'
+
+
+      - name: Install Boost
+        working-directory: .install
+        run: ./install_boost.sh ${{ env.BOOST_VERSION }}
+
       - name: Get Redis
         uses: actions/checkout@v4
         with:
@@ -56,7 +64,7 @@ jobs:
         working-directory: redis
         run: make install
       - name: Build RediSearch
-        run: make conan build
+        run: make build
             COORD=${{ inputs.cluster_env }}
             PROFILE=${{ inputs.profile_env }}
             REDISEARCH_MT_BUILD=0

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/.gitignore b/.gitignore
@@ -26,3 +26,4 @@ callgrind.out.*
 /tests/pytests/logs/
 /deps/RedisJSON/
 /1/
+/.install/boost*
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_DIR}
-
-./bootstrap.sh --prefix=.
-$MODE ./b2 headers
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,8 @@ 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= 		  # Custom boost headers location path (default value: .install/boost).
+  					  # Can be left empty if boost is located in the standard system includes path.
 make parsers       # build parsers code
 make clean         # remove build artifacts
   ALL=1|all          # remove entire artifacts directory (all: remove Conan artifacts)
@@ -237,6 +238,7 @@ CMAKE_FILES+= \
 endif
 
 #----------------------------------------------------------------------------------------------
+BOOST_DIR ?= $(ROOT)/.install/boost
 _CMAKE_FLAGS += -DMODULE_NAME=$(MODULE_NAME) -DBOOST_DIR=$(BOOST_DIR)
 
 ifeq ($(OS),macos)
@@ -245,16 +247,6 @@ 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