Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set proton version in CI to 0.39.0 #1115

Merged
merged 1 commit into from
Jun 6, 2023
Merged

Set proton version in CI to 0.39.0 #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
runtimeCheck: [asan]
protonGitRef:
- ${{ github.event.inputs.protonBranch || 'main' }}
- 0.38.0
- 0.39.0
env:
BuildType: ${{matrix.buildType}}
ProtonBuildDir: ${{github.workspace}}/qpid-proton/build
Expand Down Expand Up @@ -207,7 +207,7 @@ jobs:
runtimeCheck: [asan]
protonGitRef:
- ${{ github.event.inputs.protonBranch || 'main' }}
- 0.38.0
- 0.39.0
shard: [1, 2]
shards: [2]
env:
Expand Down Expand Up @@ -316,7 +316,7 @@ jobs:
runtimeCheck: [asan, tsan]
protonGitRef:
- ${{ github.event.inputs.protonBranch || 'main' }}
- 0.38.0
- 0.39.0
shard: [ 1, 2 ]
shards: [ 2 ]
include:
Expand Down Expand Up @@ -368,7 +368,7 @@ jobs:
cc: gcc
cxx: g++
runtimeCheck: OFF
protonGitRef: 0.38.0
protonGitRef: 0.39.0
shard: 1
shards: 2
- os: ubuntu-20.04
Expand All @@ -377,7 +377,7 @@ jobs:
cc: gcc
cxx: g++
runtimeCheck: OFF
protonGitRef: 0.38.0
protonGitRef: 0.39.0
shard: 2
shards: 2
# unittest coverage
Expand All @@ -389,7 +389,7 @@ jobs:
buildType: Coverage
covType: unit
runtimeCheck: OFF
protonGitRef: 0.38.0
protonGitRef: 0.39.0
routerCTestExtraArgs: "-R 'unittests|unit_tests|threaded_timer_test|adaptor_buffer_test|router_engine_test|management_test|router_policy_test|test_command'"
shard: 1
shards: 1
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ find_library(rt_lib rt)

find_package(Python 3.6.8 REQUIRED COMPONENTS Interpreter Development)
find_package(Threads REQUIRED)
find_package(Proton 0.38.0 REQUIRED COMPONENTS Core Proactor Tls)
find_package(Proton 0.39.0 REQUIRED COMPONENTS Core Proactor Tls)
message(STATUS "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" )

# http2 support
Expand Down
4 changes: 2 additions & 2 deletions packaging/skupper-router.spec.rpkg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@

# This package builds and statically links against its own proton-c library
# so we can use newest Proton features even before it is packaged for our distro
%global proton_vendored_version 0.38.0
%global proton_vendored_version 0.39.0
%define proton_install_prefix %{_builddir}/qpid-proton-%{proton_vendored_version}/install

%global proton_minimum_version 0.34.0
%global proton_minimum_version 0.37.0
%global libwebsockets_minimum_version 3.0.1
%global libnghttp2_minimum_version 1.33.0
%global libunwind_minimum_version 1.3.1
Expand Down