simplify ci

youyuanwu · Nov 8, 2023 · 031d681 · 031d681
1 parent ebbff53
commit 031d681
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -9,7 +9,6 @@ jobs:
       matrix:
         BUILD_TYPE: ["Debug", "Release"]
         os: [ windows-latest ]
-        BOOST_VERSION: [ 1.79.0, 1.83.0 ]
     steps:
     - uses: actions/checkout@v2
 
@@ -34,8 +33,6 @@ jobs:
         powershell.exe -Command "Add-Content $env:GITHUB_PATH 'C:\Program Files\OpenCppCoverage'"
 
     - name: run cmake
-      env:
-        BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
       run: > 
         cmake . -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -B build
     - name: run build

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,14 +5,14 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
     set(winasio_MAIN_PROJECT ON)
 endif()
 
-if(winasio_MAIN_PROJECT)
+if(winasio_MAIN_PROJECT AND NOT WINASIO_CI_FORMAT)
     # configure vcpkg
     # we use CmakePresets.json to point to vcpkg
     if ("$ENV{VCPKG_ROOT}" STREQUAL "")
     message(FATAL_ERROR "VCPKG_ROOT not found")
     endif()
     set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake")
-endif(winasio_MAIN_PROJECT)
+endif()
 
 project(winasio VERSION 0.0.1 LANGUAGES CXX)