This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch feature/483-conan-2-support in repository https://gitbox.apache.org/repos/asf/celix.git
commit 2e42f25ad95a0f45f053934fed48e2ea04fdf95e Author: PengZheng <[email protected]> AuthorDate: Sun Aug 20 20:35:10 2023 +0800 Use conan2's conanrun.sh --- .github/workflows/coverage.yml | 4 ++-- .github/workflows/macos.yml | 4 ++-- .github/workflows/ubuntu.yml | 4 ++-- documents/building/dev_celix_with_clion.md | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 5e1c0d27..045c3dff 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -38,9 +38,9 @@ jobs: - name: Test with coverage run: | cd build - source activate_run.sh + source conanrun.sh make coverage - source deactivate_run.sh + source deactivate_conanrun.sh lcx="lcov --output-file=coverage.info " && for i in `find . -name "*.info.cleaned"`; do lcx+=" --add-tracefile=$i"; done && $lcx - name: Codecov uses: codecov/codecov-action@e156083f13aff6830c92fc5faa23505779fbf649 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index b2feb276..18943351 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -44,9 +44,9 @@ jobs: - name: Test run: | cd build - source activate_run.sh + source conanrun.sh ctest --output-on-failure - source deactivate_run.sh + source deactivate_conanrun.sh macos-build-brew: runs-on: macOS-latest diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 3f2dc9da..85869deb 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -67,9 +67,9 @@ jobs: - name: Test run: | cd build - source activate_run.sh + source conanrun.sh ctest --output-on-failure - source deactivate_run.sh + source deactivate_conanrun.sh linux-build-apt: runs-on: ubuntu-22.04 diff --git a/documents/building/dev_celix_with_clion.md b/documents/building/dev_celix_with_clion.md index d6c1b926..8de4c6d3 100644 --- a/documents/building/dev_celix_with_clion.md +++ b/documents/building/dev_celix_with_clion.md @@ -23,7 +23,7 @@ limitations under the License. Apache Celix can be build for development in CLion with use of the Conan package manager. Conan will arrange the building of the Apache Celix dependencies and generate Find<package> files for these dependencies. -Conan will also generate a `active_run.sh` and `deactivate_run.sh` script that does the environment (de)setup for the +Conan will also generate a `conanrun.sh` and `deactivate_conanrun.sh` script that does the environment (de)setup for the binary locations of the build dependencies (i.e. configures `PATH` and `LD_LIBRARY_PATH`/`DYLD_LIBRARY_PATH`). ## Configuring CLion for C++17 @@ -54,9 +54,9 @@ cd cmake-build-debug make -j #optional setup run env and run tests -source activate_run.sh +source conanrun.sh ctest --verbose -source deactivate_run.sh +source deactivate_conanrun.sh ``` ## Configuring CLion
