From 21ae3dcc8193f8a05e64eb1b9c32d7b78548b7d4 Mon Sep 17 00:00:00 2001 From: offa Date: Thu, 14 Nov 2024 19:00:50 +0100 Subject: [PATCH] Test --- .github/workflows/ci.yml | 150 +++++++++++++++++++-------------------- conanfile.py | 2 + 2 files changed, 77 insertions(+), 75 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 66ce8e0..7c440fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,44 +3,44 @@ name: ci on: [push, pull_request] jobs: - build_linux: - runs-on: ubuntu-latest - strategy: - matrix: - compiler: - - gcc:14 - - gcc:13 - - clang:19 - - clang:18 - boost: - - true - - false - container: - image: "registry.gitlab.com/offa/docker-images/${{ matrix.compiler }}" - name: "${{ matrix.compiler }} (Boost: ${{ matrix.boost }})" - steps: - - uses: actions/checkout@main - - name: Cache Conan Packages - uses: actions/cache@main - with: - path: ~/.conan2/p/ - key: conan-${{ runner.os }}-${{ matrix.compiler }}-boost_${{ matrix.boost }}-${{ hashFiles('conanfile.py') }} - - name: Install dependencies - run: script/ci_setup.sh - - name: Install Boost - if: ${{ matrix.boost == true }} - run: | - add-apt-repository ppa:mhier/libboost-latest - apt-get update - apt-get install -y boost1.83 - - name: Build - run: script/ci_build.sh -DINFLUXCXX_WITH_BOOST=${{ matrix.boost }} - - name: Check deployment as cmake subdirectory - run: script/ci_testdeploy.sh -DINFLUXCXX_AS_SUBDIR=ON -DINFLUXCXX_WITH_BOOST=${{ matrix.boost }} - - name: Install - run: cmake --install build - - name: Check installed library - run: script/ci_testdeploy.sh -DINFLUXCXX_AS_SUBDIR=OFF + # build_linux: + # runs-on: ubuntu-latest + # strategy: + # matrix: + # compiler: + # - gcc:14 + # - gcc:13 + # - clang:19 + # - clang:18 + # boost: + # - true + # - false + # container: + # image: "registry.gitlab.com/offa/docker-images/${{ matrix.compiler }}" + # name: "${{ matrix.compiler }} (Boost: ${{ matrix.boost }})" + # steps: + # - uses: actions/checkout@main + # - name: Cache Conan Packages + # uses: actions/cache@main + # with: + # path: ~/.conan2/p/ + # key: conan-${{ runner.os }}-${{ matrix.compiler }}-boost_${{ matrix.boost }}-${{ hashFiles('conanfile.py') }} + # - name: Install dependencies + # run: script/ci_setup.sh + # - name: Install Boost + # if: ${{ matrix.boost == true }} + # run: | + # add-apt-repository ppa:mhier/libboost-latest + # apt-get update + # apt-get install -y boost1.83 + # - name: Build + # run: script/ci_build.sh -DINFLUXCXX_WITH_BOOST=${{ matrix.boost }} + # - name: Check deployment as cmake subdirectory + # run: script/ci_testdeploy.sh -DINFLUXCXX_AS_SUBDIR=ON -DINFLUXCXX_WITH_BOOST=${{ matrix.boost }} + # - name: Install + # run: cmake --install build + # - name: Check installed library + # run: script/ci_testdeploy.sh -DINFLUXCXX_AS_SUBDIR=OFF build_windows: @@ -81,40 +81,40 @@ jobs: script/ci_build.sh -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_FLAGS_INIT=-D_WIN32_WINNT=0x0A00 - name: Install run: cmake --build --preset conan-release --target install - - - build_osx: - runs-on: macOS-latest - name: "mac os x" - steps: - - uses: actions/checkout@main - - name: Cache Conan Packages - uses: actions/cache@main - with: - path: ~/.conan2/p/ - key: conan-${{ runner.os }}-macos-${{ hashFiles('conanfile.py') }} - - name: Install Dependencies - run: | - export HOMEBREW_NO_AUTO_UPDATE=1 - export HOMEBREW_NO_INSTALL_CLEANUP=1 - brew install boost - pipx install conan - conan profile detect - mkdir build - conan install -o "influxdb_cxx/*":system=True -o "influxdb_cxx/*":tests=True -s compiler.cppstd=20 --build=missing . -of build - - name: Build - run: script/ci_build.sh - - name: Install - run: cmake --install ./build --prefix /tmp/ci_ifdb - - - formatting-check: - name: "formatting" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@main - - uses: DoozyX/clang-format-lint-action@master - name: "Verify formatting" - with: - clangFormatVersion: 17 - + # + # + # build_osx: + # runs-on: macOS-latest + # name: "mac os x" + # steps: + # - uses: actions/checkout@main + # - name: Cache Conan Packages + # uses: actions/cache@main + # with: + # path: ~/.conan2/p/ + # key: conan-${{ runner.os }}-macos-${{ hashFiles('conanfile.py') }} + # - name: Install Dependencies + # run: | + # export HOMEBREW_NO_AUTO_UPDATE=1 + # export HOMEBREW_NO_INSTALL_CLEANUP=1 + # brew install boost + # pipx install conan + # conan profile detect + # mkdir build + # conan install -o "influxdb_cxx/*":system=True -o "influxdb_cxx/*":tests=True -s compiler.cppstd=20 --build=missing . -of build + # - name: Build + # run: script/ci_build.sh + # - name: Install + # run: cmake --install ./build --prefix /tmp/ci_ifdb + # + # + # formatting-check: + # name: "formatting" + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@main + # - uses: DoozyX/clang-format-lint-action@master + # name: "Verify formatting" + # with: + # clangFormatVersion: 17 + # diff --git a/conanfile.py b/conanfile.py index 043ed73..5571cad 100644 --- a/conanfile.py +++ b/conanfile.py @@ -17,8 +17,10 @@ class InfluxdbCxxConan(ConanFile): } def requirements(self): + self.output.warning(f">>>> {self.options.boost}") self.requires("cpr/1.11.0") if not self.options.system and self.options.boost: + self.output.warning(">>>> With Boost") self.requires("boost/1.85.0") if self.options.tests: self.requires("catch2/3.7.1")