Skip to content

Commit

Permalink
Merge pull request eclipse-uprotocol#299 from gregmedd/merge-release-…
Browse files Browse the repository at this point in the history
…to-main

Merge release branch to main
  • Loading branch information
gregmedd authored Aug 17, 2024
2 parents e8569ef + aef54e9 commit 2c101d7
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Build up-core-api conan package
shell: bash
run: |
conan create --version 1.6.0 up-conan-recipes/up-core-api/release
conan create --version 1.6.0-alpha3 up-conan-recipes/up-core-api/release
- name: Build up-cpp with tests
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
name: Build up-core-api conan package
shell: bash
run: |
conan create --version 1.6.0 up-conan-recipes/up-core-api/release
conan create --version 1.6.0-alpha3 up-conan-recipes/up-core-api/release
- if: matrix.build-mode == 'manual'
name: Build up-cpp with tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Build up-core-api conan package
shell: bash
run: |
conan create --version 1.6.0 up-conan-recipes/up-core-api/release
conan create --version 1.6.0-alpha3 up-conan-recipes/up-core-api/release
- name: Build up-cpp with tests
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ implementation, such as [up-transport-zenoh-cpp][zenoh-transport-repo].
Using the recipes found in [up-conan-recipes][conan-recipe-repo], build these
Conan packages:

1. [up-core-api][spec-repo]: `conan create --version 1.6.0 --build=missing up-core-api/release`
1. [up-core-api][spec-repo]: `conan create --version 1.6.0-alpha3 --build=missing up-core-api/release`

**NOTE:** all `conan` commands in this document use Conan 2.x syntax. Please
adjust accordingly when using Conan 1.x.
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-core-api/[~1.6]
up-core-api/[~1.6, include_prerelease]
spdlog/[~1.13]
protobuf/[~3.21]

Expand Down

0 comments on commit 2c101d7

Please sign in to comment.