Test_centos7_release_28

Signed-off-by: arnaud <[email protected]>
ARnDOSrte · Oct 12, 2023 · 3a0cf58 · 3a0cf58
1 parent 9c9cd6e
commit 3a0cf58
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 25 deletions.
diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml
@@ -36,10 +36,7 @@ jobs:
           token: ${{ secrets.TEST_TOKEN_RELEASE }}
 
       - name: Unzip Boost  
-        run: |
-          pwd
-          ls
-          unzip boost_1_73_0.zip
+        run: unzip boost_1_73_0.zip
 
       - name: Configure 3rd parties
         run: |
@@ -52,18 +49,6 @@ jobs:
 
       - name: Configure CMake
         run: |
-          pwd
-          echo $GITHUB_WORKSPACE
-          ls
-          cd __w
-          echo "on part dans __w"
-          ls
-          cd Boost/Boost/boost_1_73_0/installBoost
-          echo "On part dans __w/Boost/Boost/boost_1_73_0/installBoost"
-          ls
-          cd ../../../../
-          echo "On part deux crans en arrière"
-          ls
           source /opt/rh/devtoolset-9/enable
           cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux
 

diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml
@@ -95,15 +95,16 @@ jobs:
         env:
           SONAR_SCANNER_VERSION: 3.3.0.1492
 
-      - name: Install Boost
-        run: |
-          source /opt/rh/devtoolset-9/enable
-          wget https://boostorg.jfrog.io/artifactory/main/release/1.73.0/source/boost_1_73_0.tar.gz
-          tar -xzvf ./boost_1_73_0.tar.gz
-          cd boost_1_73_0
-          ./bootstrap.sh --prefix=/usr/local
-          ./b2 install --without-python -j 5
-          cd ..
+      - name: Download Boost-release
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          repo: 'ARnDOSrte/Boost'
+          file: 'boost_1_73_0.zip'
+          target: 'boost_1_73_0.zip'
+          token: ${{ secrets.TEST_TOKEN_RELEASE }}
+
+      - name: Unzip Boost  
+        run: unzip boost_1_73_0.zip
 
       - name: Checkout sources
         uses: actions/checkout@v1
@@ -124,6 +125,7 @@ jobs:
           source /opt/rh/devtoolset-9/enable
           cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build
           -DCMAKE_BUILD_TYPE=Debug
+          -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost
           -DCODE_COVERAGE=TRUE
           -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install
       
@@ -132,6 +134,7 @@ jobs:
         run: >
           cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build
           -DCMAKE_BUILD_TYPE=Debug
+          -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost
           -DCODE_COVERAGE=FALSE
           -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install