Set version of proton to 0.40.0 (#1686)

skupperproject · Dec 3, 2024 · 8237ce3 · 8237ce3
1 parent 8d3a4c5
commit 8237ce3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 18 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -57,7 +57,7 @@ jobs:
         runtimeCheck: [asan, tsan]
         protonGitRef:
           - ${{ github.event.inputs.protonBranch || 'main' }}
-          - 0.39.0
+          - 0.40.0
         exclude:
           - buildType: Debug
             runtimeCheck: tsan
@@ -154,14 +154,9 @@ jobs:
       - name: Zero ccache stats
         run: ccache -z
 
-      - name: Install python package for proton
-        if: ${{ matrix.protonGitRef == 'main' }}
+      - name: Install python packages for proton from ci_requirements.txt
         run: python3 -m pip install --upgrade -r ${{github.workspace}}/qpid-proton/python/ci_requirements.txt
 
-      - name: Install python package for proton 0.39.0
-        if: ${{ matrix.protonGitRef == '0.39.0' }}
-        run: python3 -m pip install setuptools wheel cffi
-
       - name: qpid-proton cmake configure
         working-directory: ${{env.ProtonBuildDir}}
         run: >
@@ -231,7 +226,7 @@ jobs:
         runtimeCheck: [asan, tsan]
         protonGitRef:
           - ${{ github.event.inputs.protonBranch || 'main' }}
-          - 0.39.0
+          - 0.40.0
         shard: [1, 2]
         shards: [2]
         exclude:
@@ -504,7 +499,7 @@ jobs:
         runtimeCheck: [asan, tsan]
         protonGitRef:
           - ${{ github.event.inputs.protonBranch || 'main' }}
-          - 0.39.0
+          - 0.40.0
         shard: [ 1, 2 ]
         shards: [ 2 ]
         exclude:
@@ -573,7 +568,7 @@ jobs:
           #   buildType: Coverage
           #   covType: unit
           #   runtimeCheck: OFF
-          #   protonGitRef: 0.39.0
+          #   protonGitRef: 0.40.0
           #   routerCTestExtraArgs: "-R 'unittests|unit_tests|threaded_timer_test|router_engine_test|management_test|router_policy_test|test_command'"
           #   shard: 1
           #   shards: 1
@@ -709,13 +704,8 @@ jobs:
         run: ${PYTHON} -m pip install --upgrade pip
 
       - name: Install python package for qpid-proton
-        if: ${{ matrix.protonGitRef == 'main' }}
         run: ${PYTHON} -m pip install --upgrade -r ${{github.workspace}}/qpid-proton/python/ci_requirements.txt
 
-      - name: Install python package for 0.39.0 qpid-proton
-        if: ${{ matrix.protonGitRef == '0.39.0' }}
-        run: ${PYTHON} -m pip install setuptools wheel cffi
-
       # https://cristianadam.eu/20200113/speeding-up-c-plus-plus-github-actions-using-ccache/
       # https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#environment-files
       - name: Prepare ccache timestamp

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -198,7 +198,7 @@ find_library(rt_lib rt)
 
 find_package(Python 3.9 REQUIRED COMPONENTS Interpreter Development)
 find_package(Threads REQUIRED)
-find_package(Proton 0.39.0 REQUIRED COMPONENTS Core Proactor Tls)
+find_package(Proton 0.40.0 REQUIRED COMPONENTS Core Proactor Tls)
 get_target_property(Proton_LOCATION Proton::qpid-proton LOCATION)
 message(STATUS "Found Proton: ${Proton_LOCATION} (found version \"${Proton_VERSION}\")" )
 

diff --git a/packaging/skupper-router.spec b/packaging/skupper-router.spec
@@ -35,7 +35,7 @@
 
 # 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.39.0
+%global proton_vendored_version 0.40.0
 %define proton_install_prefix %{_builddir}/qpid-proton-%{proton_vendored_version}/install
 
 %global python_minimum_version 3.9.0

diff --git a/src/adaptors/amqp/container.c b/src/adaptors/amqp/container.c
@@ -139,7 +139,7 @@ qd_session_t *qd_session(pn_session_t *pn_ssn);
 static void qd_session_configure_incoming_window(qd_session_t *qd_ssn, uint32_t in_window);
 
 #if USE_PN_SESSION_WINDOWS
-// Access to the remote incoming window was added to Proton post-0.39.0
+// Access to the remote incoming window was added in Proton 0.40.0
 static void qd_session_set_remote_incoming_window(qd_session_t *qd_ssn, uint32_t in_window);
 #endif