Fix conv

owent · Oct 17, 2024 · 09aaaf4 · 09aaaf4
1 parent 505bba3
commit 09aaaf4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -187,14 +187,12 @@ jobs:
         uses: actions/cache@v3
         with:
           path: |
-            /usr/local/share/vcpkg/installed
             third_party/install
           key: ${{ runner.os }}-coverage-${ hashFiles('.github/.cache-key') }) }}
       - name: Generate coverage
         shell: bash
         env:
           USE_CC: ${{ matrix.cc }}
-          VCPKG_TARGET_TRIPLET: ${{ matrix.triplet }}
           USE_SSL: ${{ matrix.ssl }}
           GCOV_FLAGS: "${{ matrix.gcov_flags }}"
         run: |

diff --git a/ci/do_ci.sh b/ci/do_ci.sh
@@ -68,16 +68,13 @@ if [[ "$1" == "format" ]]; then
 elif [[ "$1" == "coverage" ]]; then
   CONFIGURATION=Debug
   if [[ "x$USE_SSL" == "xmbedtls" ]]; then
-    vcpkg install --triplet=$VCPKG_TARGET_TRIPLET mbedtls
     CRYPTO_OPTIONS="-DATFRAMEWORK_CMAKE_TOOLSET_THIRD_PARTY_CRYPTO_USE_MBEDTLS=ON"
   else
-    vcpkg install --triplet=$VCPKG_TARGET_TRIPLET openssl
     CRYPTO_OPTIONS="-DATFRAMEWORK_CMAKE_TOOLSET_THIRD_PARTY_CRYPTO_USE_OPENSSL=ON"
   fi
-  vcpkg install --triplet=$VCPKG_TARGET_TRIPLET fmt
+  bash cmake_dev.sh -lus -b $CONFIGURATION -r build_jobs_coverage_prepare -c $USE_CC -- $CRYPTO_OPTIONS "-DATFRAMEWORK_CMAKE_TOOLSET_THIRD_PARTY_LOW_MEMORY_MODE=ON"
   bash cmake_dev.sh -lus -b $CONFIGURATION -r build_jobs_coverage -c $USE_CC -- $CRYPTO_OPTIONS "-DCMAKE_C_FLAGS=$GCOV_FLAGS" "-DCMAKE_CXX_FLAGS=$GCOV_FLAGS" \
-    "-DCMAKE_EXE_LINKER_FLAGS=$GCOV_FLAGS" -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake \
-    -DVCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET "-DATFRAMEWORK_CMAKE_TOOLSET_THIRD_PARTY_LOW_MEMORY_MODE=ON"
+    "-DCMAKE_EXE_LINKER_FLAGS=$GCOV_FLAGS" "-DATFRAMEWORK_CMAKE_TOOLSET_THIRD_PARTY_LOW_MEMORY_MODE=ON"
   cd build_jobs_coverage
   cmake --build . -j --config $CONFIGURATION || cmake --build . --config $CONFIGURATION
   ctest . -VV -C --config $CONFIGURATION -L atframe_utils