@@ -300,6 +300,7 @@ jobs:
300300 containerTag : ['35']
301301 buildType : [RelWithDebInfo]
302302 runtimeCheck : [asan, tsan]
303+ python : [/usr/bin/python3.10d]
303304 protonGitRef :
304305 - ${{ github.event.inputs.protonBranch || 'main' }}
305306 - 0.37.0
@@ -311,27 +312,31 @@ jobs:
311312 container : ' centos'
312313 containerTag : stream8
313314 runtimeCheck : OFF
315+ python : /usr/bin/python3.6-debug
314316 protonGitRef : ${{ github.event.inputs.protonBranch || 'main' }}
315317 shard : 1
316318 shards : 2
317319 - os : ubuntu-20.04
318320 container : ' centos'
319321 containerTag : stream8
320322 runtimeCheck : OFF
323+ python : /usr/bin/python3.6-debug
321324 protonGitRef : ${{ github.event.inputs.protonBranch || 'main' }}
322325 shard : 2
323326 shards : 2
324327 - os : ubuntu-20.04
325328 container : ' centos'
326329 containerTag : stream8
327330 runtimeCheck : OFF
331+ python : /usr/bin/python3.6-debug
328332 protonGitRef : 0.37.0
329333 shard : 1
330334 shards : 2
331335 - os : ubuntu-20.04
332336 container : ' centos'
333337 containerTag : stream8
334338 runtimeCheck : OFF
339+ python : /usr/bin/python3.6-debug
335340 protonGitRef : 0.37.0
336341 shard : 2
337342 shards : 2
@@ -375,10 +380,11 @@ jobs:
375380 -DENABLE_FUZZ_TESTING=OFF
376381 -DRUNTIME_CHECK=${{matrix.runtimeCheck}}
377382 -DBUILD_TLS=ON
383+ -DPython_EXECUTABLE=${{matrix.python}}
378384 RouterCMakeExtraArgs : >
379385 -DCMAKE_C_COMPILER_LAUNCHER=ccache
380386 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
381- -DPython_EXECUTABLE=/usr/bin/python3
387+ -DPython_EXECUTABLE=${{matrix.python}}
382388 -DRUNTIME_CHECK=${{matrix.runtimeCheck}}
383389
384390 CCACHE_BASEDIR : ${{github.workspace}}
@@ -413,10 +419,10 @@ jobs:
413419
414420 - name : Install Linux build dependencies
415421 run : |
416- dnf install -y gcc gcc-c++ cmake libuuid-devel openssl-devel cyrus-sasl-devel cyrus-sasl-plain swig python3-devel python3-pip make libwebsockets-devel libnghttp2-devel ccache libasan libubsan libtsan
422+ dnf install -y gcc gcc-c++ cmake libuuid-devel openssl-devel cyrus-sasl-devel cyrus-sasl-plain swig python3-devel python3-debug python3- pip make libwebsockets-devel libnghttp2-devel ccache libasan libubsan libtsan
417423
418424 - name : Install Python build dependencies
419- run : python3 -m pip install setuptools wheel tox
425+ run : ${{matrix.python}} -m pip install setuptools wheel tox
420426
421427 # https://cristianadam.eu/20200113/speeding-up-c-plus-plus-github-actions-using-ccache/
422428 - name : Prepare ccache timestamp
@@ -489,16 +495,24 @@ jobs:
489495 - name : Upgrade pip
490496 run : python3 -m pip install --upgrade pip
491497
498+ - name : CentOS 8 python3.6-debug needs this to build pip packages from source in next step
499+ if : ${{ matrix.container == 'centos' }}
500+ run : |
501+ dnf install -y libxml2-devel libxslt-devel
502+
492503 - name : Install Python runtime/test dependencies
493- run : python3 -m pip install -r ${{github.workspace}}/skupper-router/requirements-dev.txt
504+ run : ${{matrix.python}} -m pip install -r ${{github.workspace}}/skupper-router/requirements-dev.txt
494505
495506 - name : Install Linux runtime/test dependencies
496507 run : |
497508 dnf install -y curl nmap-ncat gdb binutils elfutils elfutils-debuginfod-client findutils file
498509 dnf debuginfo-install -y python3
499510
511+ - name : Replace /usr/bin/python3 with ${{matrix.python}}, for tools such as skmanage
512+ run : sudo ln -sf ${{matrix.python}} /usr/bin/python3
513+
500514 - name : install qpid-proton python wheel
501- run : python3 -m pip install ${ProtonBuildDir}/python/pkgs/python_qpid_proton*.whl
515+ run : ${{matrix.python}} -m pip install ${ProtonBuildDir}/python/pkgs/python_qpid_proton*.whl
502516
503517 - name : CTest
504518 working-directory : ${{env.RouterBuildDir}}
0 commit comments