Skip to content

Commit

Permalink
Updating CI and pointing at pre-release up-cpp
Browse files Browse the repository at this point in the history
The pre-release up-cpp has critical bugfixes required for this code to
build.
  • Loading branch information
gregmedd committed Jul 26, 2024
1 parent f82c1d1 commit a3b2e70
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ jobs:
- name: Build up-core-api conan package
shell: bash
run: |
conan create --version 1.5.8 up-conan-recipes/up-core-api/developer
conan create --version 1.6.0 up-conan-recipes/up-core-api/release
- name: Build up-cpp conan package
shell: bash
run: |
conan create --version 0.2.0 --build=missing up-conan-recipes/up-cpp/developer
conan create --version 1.0.1-rc1 --build=missing up-conan-recipes/up-cpp/release
- name: Build zenohcpp conan package
shell: bash
Expand All @@ -53,8 +53,8 @@ jobs:
run: |
cd up-transport-zenoh-cpp
conan install . --build=missing
cd build
cmake -S .. -DCMAKE_TOOLCHAIN_FILE=Release/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=yes
cmake --preset conan-release -DCMAKE_EXPORT_COMPILE_COMMANDS=yes
cd build/Release
cmake --build . -- -j
- name: Save conan cache to archive
Expand All @@ -66,13 +66,13 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: build-artifacts
path: up-transport-zenoh-cpp/build
path: up-transport-zenoh-cpp/build/Release

- name: Upload compile commands
uses: actions/upload-artifact@v4
with:
name: compile-commands
path: up-transport-zenoh-cpp/build/compile_commands.json
path: up-transport-zenoh-cpp/build/Release/compile_commands.json

- name: Upload conan cache for linting
uses: actions/upload-artifact@v4
Expand All @@ -90,12 +90,12 @@ jobs:
uses: actions/download-artifact@v4
with:
name: build-artifacts
path: up-transport-zenoh-cpp/build
path: up-transport-zenoh-cpp/build/Release

- name: Run all tests
shell: bash
run: |
cd up-transport-zenoh-cpp/build
cd up-transport-zenoh-cpp/build/Release
chmod +x bin/*
ctest
Expand All @@ -104,7 +104,7 @@ jobs:
if: success() || failure()
with:
name: test-results
path: 'up-transport-zenoh-cpp/build/test/results/*.xml'
path: 'up-transport-zenoh-cpp/build/Release/test/results/*.xml'

lint:
name: Lint C++ sources
Expand Down
2 changes: 1 addition & 1 deletion conanfile.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[requires]
up-cpp/[~1.0]
up-cpp/[^1.0.1, include_prerelease]
zenohcpp/0.11.0
zenohc/0.11.0
spdlog/[~1.13]
Expand Down

0 comments on commit a3b2e70

Please sign in to comment.